From 04e9405836597ba1959beb7b515334a2d6fa822d Mon Sep 17 00:00:00 2001 From: Garrett Holmstrom Date: Wed, 8 Nov 2017 10:12:02 -0800 Subject: [PATCH] Relicense ucsb-euca-c-gpl -> ucsb-es-c-bsd --- .../blockstorage/BlockDeviceResource.java | 87 ++++++--------- .../eucalyptus/blockstorage/FileResource.java | 87 ++++++--------- .../com/eucalyptus/blockstorage/Storage.java | 95 +++++++---------- .../blockstorage/StorageResource.java | 87 ++++++--------- .../blockstorage/ceph/CephRbdInputStream.java | 87 ++++++--------- .../ceph/CephRbdOutputStream.java | 87 ++++++--------- .../blockstorage/ceph/CephRbdResource.java | 87 ++++++--------- .../entities/CephRbdImageToBeDeleted.java | 87 ++++++--------- .../ceph/entities/CephRbdInfo.java | 87 ++++++--------- .../entities/CephRbdSnapshotToBeDeleted.java | 87 ++++++--------- .../CannotDeleteCephImageException.java | 95 +++++++---------- .../CephImageNotFoundException.java | 95 +++++++---------- .../exceptions/EucalyptusCephException.java | 95 +++++++---------- .../BlockStorageGlobalConfiguration.java | 87 ++++++--------- .../blockstorage/entities/CHAPUserInfo.java | 87 ++++++--------- .../blockstorage/entities/DASInfo.java | 87 ++++++--------- .../entities/DirectStorageInfo.java | 87 ++++++--------- .../blockstorage/entities/ISCSIMetaInfo.java | 87 ++++++--------- .../entities/ISCSIVolumeInfo.java | 87 ++++++--------- .../blockstorage/entities/LVMMetaInfo.java | 95 +++++++---------- .../blockstorage/entities/LVMVolumeInfo.java | 87 ++++++--------- .../blockstorage/entities/SnapshotInfo.java | 87 ++++++--------- .../blockstorage/entities/SnapshotPart.java | 87 ++++++--------- .../SnapshotTransferConfiguration.java | 87 ++++++--------- .../entities/SnapshotUploadInfo.java | 87 ++++++--------- .../blockstorage/entities/StorageInfo.java | 87 ++++++--------- .../entities/VolumeExportRecord.java | 87 ++++++--------- .../blockstorage/entities/VolumeInfo.java | 87 ++++++--------- .../blockstorage/entities/VolumeToken.java | 87 ++++++--------- .../exceptions/AccessDeniedException.java | 95 +++++++---------- .../ConnectionInfoNotFoundException.java | 95 +++++++---------- .../exceptions/NoSuchRecordException.java | 95 +++++++---------- .../SnapshotFinalizeMpuException.java | 95 +++++++---------- .../SnapshotInitializeMpuException.java | 95 +++++++---------- .../exceptions/SnapshotNotFoundException.java | 95 +++++++---------- .../exceptions/SnapshotTooLargeException.java | 87 ++++++--------- .../exceptions/SnapshotTransferException.java | 95 +++++++---------- .../SnapshotUploadObjectException.java | 95 +++++++---------- .../SnapshotUploadPartException.java | 95 +++++++---------- .../ThreadPoolNotInitializedException.java | 95 +++++++---------- .../exceptions/UnknownSizeException.java | 95 +++++++---------- .../exceptions/VolumeNotFoundException.java | 95 +++++++---------- .../msgs/StorageConfigurationMessages.groovy | 95 +++++++---------- .../msgs/StorageController.groovy | 87 ++++++--------- .../san/common/SANProperties.java | 98 +++++++---------- .../san/common/entities/SANInfo.java | 98 +++++++---------- .../san/common/entities/SANVolumeInfo.java | 98 +++++++---------- .../upgrade/SANVolumeInfo400Upgrade.java | 87 ++++++--------- .../BlockStorageEventListener.java | 87 ++++++--------- .../BlockStorageManagerFactory.java | 87 ++++++--------- .../FileInputStreamWithCallback.java | 87 ++++++--------- .../eucalyptus/blockstorage/HttpReader.java | 87 ++++++--------- .../eucalyptus/blockstorage/HttpTransfer.java | 87 ++++++--------- .../eucalyptus/blockstorage/HttpWriter.java | 87 ++++++--------- .../eucalyptus/blockstorage/LVMWrapper.java | 98 +++++++---------- .../blockstorage/LogicalStorageManager.java | 87 ++++++--------- .../blockstorage/OverlayManager.java | 87 ++++++--------- .../blockstorage/PutMethodWithProgress.java | 87 ++++++--------- .../blockstorage/S3SnapshotTransfer.java | 87 ++++++--------- .../SnapshotProgressCallback.java | 87 ++++++--------- .../blockstorage/SnapshotTransfer.java | 87 ++++++--------- .../blockstorage/StorageExportManager.java | 95 +++++++---------- .../blockstorage/StorageManagers.java | 100 +++++++----------- .../blockstorage/VolumeTokenService.java | 87 ++++++--------- .../async/SnapshotTransferCleaner.java | 87 ++++++--------- .../blockstorage/async/VolumeDeleter.java | 87 ++++++--------- .../async/VolumeStateChecker.java | 87 ++++++--------- .../blockstorage/async/VolumesConvertor.java | 87 ++++++--------- .../bootstrap/BlockStorageBootstrapper.java | 87 ++++++--------- .../config/StorageControllerBuilder.java | 87 ++++++--------- .../StorageControllerConfiguration.java | 87 ++++++--------- ...ExternalStorageControllerSoapPipeline.java | 87 ++++++--------- .../san/common/AbstractSANTask.java | 98 +++++++---------- .../blockstorage/san/common/Paths.java | 98 +++++++---------- .../blockstorage/san/common/SANManager.java | 98 +++++++---------- .../blockstorage/san/common/SANProvider.java | 98 +++++++---------- .../blockstorage/san/common/SANTask.java | 98 +++++++---------- .../san/common/SessionManager.java | 98 +++++++---------- .../san/common/ShellSessionManager.java | 98 +++++++---------- .../threadpool/CheckerThreadPool.java | 87 ++++++--------- .../threadpool/SnapshotThreadPool.java | 87 ++++++--------- .../SnapshotTransferThreadPool.java | 87 ++++++--------- .../threadpool/VolumeThreadPool.java | 87 ++++++--------- .../upgrade/VolumeExportRecord411Upgrade.java | 87 ++++++--------- .../blockstorage/CreateSnapshotTest.java | 87 ++++++--------- .../CreateVolumeFromSnapshotTest.java | 87 ++++++--------- .../blockstorage/DeleteSnapshotTest.java | 87 ++++++--------- .../eucalyptus/blockstorage/StorageTests.java | 95 +++++++---------- .../eucalyptus/blockstorage/VolumeTest.java | 87 ++++++--------- .../san/common/SANManagerTest.java | 87 ++++++--------- .../src/main/native/eucalyptus-bootstrap.h | 87 ++++++--------- .../java/com/eucalyptus/address/Address.java | 87 ++++++--------- .../eucalyptus/address/AddressManager.java | 87 ++++++--------- .../com/eucalyptus/address/Addresses.java | 87 ++++++--------- .../blockstorage/SnapshotManager.java | 87 ++++++--------- .../SnapshotUpdateEventListener.java | 87 ++++++--------- .../blockstorage/VolumeManager.java | 87 ++++++--------- .../VolumeUpdateEventListener.java | 87 ++++++--------- .../com/eucalyptus/blockstorage/Volumes.java | 87 ++++++--------- .../eucalyptus/cloud/EucalyptusBuilder.java | 87 ++++++--------- .../cloud/EucalyptusConfiguration.groovy | 95 +++++++---------- .../com/eucalyptus/cloud/ResourceToken.java | 87 ++++++--------- .../java/com/eucalyptus/cloud/VmRunType.java | 87 ++++++--------- .../cloud/run/AdmissionControl.java | 87 ++++++--------- .../com/eucalyptus/cloud/run/Allocations.java | 87 ++++++--------- .../cloud/run/ClusterAllocator.java | 87 ++++++--------- .../cloud/run/ContractEnforcement.java | 87 ++++++--------- .../cloud/run/VerificationException.java | 95 +++++++---------- .../eucalyptus/cloud/run/VerifyMetadata.java | 87 ++++++--------- .../java/com/eucalyptus/cluster/Cluster.java | 87 ++++++--------- .../eucalyptus/cluster/ClusterBuilder.java | 87 ++++++--------- .../cluster/ClusterClientPipelineFactory.java | 87 ++++++--------- .../cluster/ClusterConfiguration.java | 87 ++++++--------- .../eucalyptus/cluster/ClusterEndpoint.java | 87 ++++++--------- .../java/com/eucalyptus/cluster/Clusters.java | 87 ++++++--------- .../cluster/GatherLogClientPipeline.java | 87 ++++++--------- .../NetworkAlreadyExistsException.java | 95 +++++++---------- .../com/eucalyptus/cluster/ResourceState.java | 87 ++++++--------- .../callback/ClusterCertsCallback.java | 87 ++++++--------- .../callback/ClusterLogMessageCallback.java | 95 +++++++---------- .../cluster/callback/LogDataCallback.java | 87 ++++++--------- .../cluster/callback/RebootCallback.java | 87 ++++++--------- .../callback/ResourceStateCallback.java | 87 ++++++--------- .../callback/StartServiceCallback.java | 95 +++++++---------- .../cluster/callback/StateUpdateHandler.java | 87 ++++++--------- .../callback/StateUpdateMessageCallback.java | 87 ++++++--------- .../cluster/callback/TerminateCallback.java | 87 ++++++--------- .../cluster/callback/VmRunCallback.java | 87 ++++++--------- .../cluster/callback/VmStateCallback.java | 87 ++++++--------- .../callback/VolumeAttachCallback.java | 87 ++++++--------- .../callback/VolumeDetachCallback.java | 87 ++++++--------- .../cluster/event/ClusterEvents.groovy | 95 +++++++---------- .../compute/ComputeDefaultHandler.java | 95 +++++++---------- .../compute/conversion/ExportManager.java | 47 +++----- .../conversion/ImageManifestException.java | 51 +++------ .../compute/entities/ComputeMetadata.java | 95 +++++++---------- .../metadata/InstanceDataDnsResolver.java | 51 +++------ .../compute/metadata/MetadataPipeline.java | 87 ++++++--------- .../compute/metadata/VmMetadata.java | 87 ++++++--------- .../compute/policy/AddressNumberQuotaKey.java | 87 ++++++--------- .../compute/policy/ExpirationTime.java | 87 ++++++--------- .../compute/policy/ImageNumberQuotaKey.java | 87 ++++++--------- .../eucalyptus/compute/policy/KeepAlive.java | 87 ++++++--------- .../policy/SnapshotNumberQuotaKey.java | 87 ++++++--------- .../VmInstanceActiveNumberQuotaKey.java | 87 ++++++--------- .../policy/VmInstanceNumberQuotaKey.java | 87 ++++++--------- .../compute/policy/VolumeNumberQuotaKey.java | 87 ++++++--------- .../policy/VolumeTotalSizeQuotaKey.java | 87 ++++++--------- .../main/java/com/eucalyptus/images/Emis.java | 87 ++++++--------- .../eucalyptus/images/ImageConfiguration.java | 87 ++++++--------- .../com/eucalyptus/images/ImageManager.java | 87 ++++++--------- .../com/eucalyptus/images/ImageManifests.java | 47 +++----- .../java/com/eucalyptus/images/Images.java | 87 ++++++--------- .../com/eucalyptus/keys/KeyPairManager.java | 87 ++++++--------- .../network/NetworkGroupManager.java | 87 ++++++--------- .../com/eucalyptus/network/NetworkGroups.java | 87 ++++++--------- .../eucalyptus/network/NetworkIndexRange.java | 95 +++++++---------- .../com/eucalyptus/node/NodeController.java | 87 ++++++--------- .../node/NodeControllerConfiguration.java | 87 ++++++--------- .../NodeControllerConfigurationBuilder.java | 87 ++++++--------- ...NodeControllerConfigurationMessages.groovy | 87 ++++++--------- .../main/java/com/eucalyptus/node/Nodes.java | 45 ++------ .../util/async/StatefulMessageSet.java | 87 ++++++--------- .../main/java/com/eucalyptus/vm/Bundles.java | 87 ++++++--------- .../com/eucalyptus/vm/MetadataRequest.java | 87 ++++++--------- .../java/com/eucalyptus/vm/MigrationTags.java | 87 ++++++--------- .../java/com/eucalyptus/vm/VmControl.java | 87 ++++++--------- .../com/eucalyptus/vm/VmInstanceMetadata.java | 87 ++++++--------- .../java/com/eucalyptus/vm/VmInstances.java | 87 ++++++--------- .../vm/dns/InstanceDomainNames.java | 51 +++------ .../vm/dns/RecursiveDnsResolver.java | 39 ++----- .../vm/dns/SplitHorizonResolver.java | 47 +++----- .../java/com/eucalyptus/vmtypes/VmTypes.java | 87 ++++++--------- .../vmtypes/VmTypes330Upgrade.groovy | 87 ++++++--------- .../eucalyptus/vmtypes/VmTypesManager.java | 91 ++++++---------- .../eucalyptus/cloud/ws/ComponentService.java | 87 ++++++--------- .../compute/common/CloudMetadata.java | 87 ++++++--------- .../compute/common/CloudMetadatas.java | 87 ++++++--------- .../compute/common/ImageMetadata.java | 87 ++++++--------- .../compute/common/StaticDiskImage.java | 95 +++++++---------- .../EucalyptusConfigurationMessages.groovy | 95 +++++++---------- .../internal/blockstorage/Snapshot.java | 87 ++++++--------- .../internal/blockstorage/Snapshots.java | 87 ++++++--------- .../common/internal/blockstorage/State.java | 95 +++++++---------- .../common/internal/blockstorage/Volume.java | 87 ++++++--------- .../images/BlockStorageDeviceMapping.java | 87 ++++++--------- .../images/BlockStorageImageInfo.java | 87 ++++++--------- .../internal/images/BootableImageInfo.java | 87 ++++++--------- .../common/internal/images/DeviceMapping.java | 87 ++++++--------- .../images/EphemeralDeviceMapping.java | 87 ++++++--------- .../common/internal/images/ImageInfo.java | 87 ++++++--------- .../common/internal/images/Images.java | 87 ++++++--------- .../internal/images/KernelImageInfo.java | 87 ++++++--------- .../internal/images/MachineImageInfo.java | 87 ++++++--------- .../images/PendingRegistrationImageInfo.java | 91 ++++++---------- .../internal/images/PutGetImageInfo.java | 87 ++++++--------- .../internal/images/RamdiskImageInfo.java | 87 ++++++--------- .../images/SuppressDeviceMappping.java | 95 +++++++---------- .../common/internal/keys/KeyPairs.java | 87 ++++++--------- .../common/internal/keys/SshKeyPair.java | 87 ++++++--------- .../common/internal/network/NetworkGroup.java | 87 ++++++--------- .../internal/network/NetworkGroups.java | 87 ++++++--------- .../common/internal/network/NetworkPeer.java | 87 ++++++--------- .../common/internal/network/NetworkRule.java | 87 ++++++--------- .../util/DuplicateMetadataException.java | 95 +++++++---------- .../util/IllegalMetadataAccessException.java | 87 ++++++--------- .../util/InvalidMetadataException.java | 95 +++++++---------- .../util/MetadataCreationException.java | 95 +++++++---------- .../internal/util/MetadataException.java | 95 +++++++---------- .../internal/util/NoSuchImageIdException.java | 95 +++++++---------- .../util/NoSuchMetadataException.java | 95 +++++++---------- .../util/NotEnoughResourcesException.java | 95 +++++++---------- .../internal/util/PersistentReference.java | 87 ++++++--------- .../common/internal/util/Reference.java | 87 ++++++--------- .../util/ResourceAllocationException.java | 95 +++++++---------- .../common/internal/vm/MigrationState.java | 87 ++++++--------- .../common/internal/vm/VmBootRecord.java | 87 ++++++--------- .../common/internal/vm/VmBundleTask.java | 87 ++++++--------- .../common/internal/vm/VmCreateImageTask.java | 87 ++++++--------- .../internal/vm/VmEphemeralAttachment.java | 87 ++++++--------- .../compute/common/internal/vm/VmId.java | 87 ++++++--------- .../common/internal/vm/VmInstance.java | 87 ++++++--------- .../common/internal/vm/VmInstances.java | 87 ++++++--------- .../common/internal/vm/VmLaunchRecord.java | 87 ++++++--------- .../common/internal/vm/VmMigrationTask.java | 87 ++++++--------- .../common/internal/vm/VmNetworkConfig.java | 87 ++++++--------- .../common/internal/vm/VmPlacement.java | 87 ++++++--------- .../common/internal/vm/VmRuntimeState.java | 87 ++++++--------- .../common/internal/vm/VmUsageStats.java | 87 ++++++--------- .../internal/vm/VmVolumeAttachment.java | 87 ++++++--------- .../common/internal/vm/VmVolumeState.java | 87 ++++++--------- .../internal/vmtypes/EphemeralDisk.java | 87 ++++++--------- .../common/internal/vmtypes/VmType.java | 87 ++++++--------- .../common/policy/Ec2ResourceName.java | 95 +++++++---------- .../config/ArbitratorBootstrapper.java | 87 ++++++--------- .../eucalyptus/config/ArbitratorBuilder.java | 87 ++++++--------- .../ArbitratorConfigurationMessages.groovy | 95 +++++++---------- .../eucalyptus/config/ArbitratorControl.java | 87 ++++++--------- .../ClusterConfigurationMessages.groovy | 95 +++++++---------- .../config/ConfigurationManager.java | 87 ++++++--------- .../config/ConfigurationMessages.groovy | 87 ++++++--------- .../eucalyptus/config/PropertiesManager.java | 87 ++++++--------- .../config/PropertiesMessages.groovy | 87 ++++++--------- .../event/SystemConfigurationEvent.java | 95 +++++++---------- .../upgrade/DatabaseDestination.java | 95 +++++++---------- .../upgrade/PostgresqlDestination.java | 87 ++++++--------- .../upgrade/StandalonePersistence.java | 87 ++++++--------- .../cloud/NoSuchSnapshotException.java | 87 ++++++--------- .../cloud/NoSuchVolumeException.java | 87 ++++++--------- .../cloud/SnapshotInUseException.java | 87 ++++++--------- .../cloud/VolumeAlreadyExistsException.java | 87 ++++++--------- .../cloud/VolumeInUseException.java | 87 ++++++--------- .../cloud/VolumeNotReadyException.java | 87 ++++++--------- .../cloud/VolumeSizeExceededException.java | 87 ++++++--------- .../ucsb/eucalyptus/util/ConfigParser.java | 87 ++++++--------- .../ucsb/eucalyptus/util/EucaSemaphore.java | 95 +++++++---------- .../util/EucaSemaphoreDirectory.java | 87 ++++++--------- .../eucalyptus/util/ReplyCoordinator.java | 87 ++++++--------- .../ucsb/eucalyptus/util/StreamConsumer.java | 87 ++++++--------- .../edu/ucsb/eucalyptus/util/SystemUtil.java | 87 ++++++--------- .../eucalyptus/upgrade/TestDescription.java | 95 +++++++---------- .../com/eucalyptus/upgrade/TestHarness.java | 87 ++++++--------- .../com/eucalyptus/upgrade/TestListener.java | 87 ++++++--------- .../eucalyptus/bootstrap/DNSBootstrapper.java | 87 ++++++--------- .../com/eucalyptus/cloud/ws/DNSControl.java | 87 ++++++--------- .../com/eucalyptus/cloud/ws/TCPHandler.java | 87 ++++++--------- .../com/eucalyptus/cloud/ws/TCPListener.java | 87 ++++++--------- .../auth/euare/EuareMessages.groovy | 87 ++++++--------- .../auth/AuthenticationProperties.java | 87 ++++++--------- .../auth/euare/AccountProvider.java | 87 ++++++--------- .../com/eucalyptus/auth/euare/Accounts.java | 87 ++++++--------- .../eucalyptus/auth/euare/EuareException.java | 87 ++++++--------- .../eucalyptus/auth/euare/EuareQuotaUtil.java | 87 ++++++--------- .../eucalyptus/auth/euare/EuareService.java | 87 ++++++--------- .../auth/euare/GroupNumberQuotaKey.java | 87 ++++++--------- .../com/eucalyptus/auth/euare/Privileged.java | 87 ++++++--------- .../auth/euare/UserNumberQuotaKey.java | 87 ++++++--------- .../euare/checker/InvalidValueException.java | 95 +++++++---------- .../auth/euare/checker/ValueChecker.java | 95 +++++++---------- .../euare/checker/ValueCheckerFactory.java | 87 ++++++--------- .../auth/euare/ldap/LdapClient.java | 87 ++++++--------- .../ldap/LdapIntegrationConfiguration.java | 87 ++++++--------- .../eucalyptus/auth/euare/ldap/LdapSync.java | 87 ++++++--------- .../eucalyptus/auth/euare/ldap/LicParser.java | 87 ++++++--------- .../eucalyptus/auth/euare/ldap/LicSpec.java | 87 ++++++--------- .../eucalyptus/auth/euare/ldap/Selection.java | 87 ++++++--------- .../authentication/AuthenticationUtil.java | 87 ++++++--------- .../authentication/DefaultAuthenticator.java | 87 ++++++--------- .../authentication/EasySSLSocketFactory.java | 87 ++++++--------- .../GssapiKrb5Authenticator.java | 87 ++++++--------- .../authentication/LdapAuthenticator.java | 87 ++++++--------- .../LdapAuthenticatorFactory.java | 95 +++++++---------- .../euare/persist/DatabaseAccessKeyProxy.java | 87 ++++++--------- .../euare/persist/DatabaseAccountProxy.java | 87 ++++++--------- .../persist/DatabaseAuthBootstrapper.java | 87 ++++++--------- .../euare/persist/DatabaseAuthProvider.java | 87 ++++++--------- .../auth/euare/persist/DatabaseAuthUtils.java | 87 ++++++--------- .../persist/DatabaseCertificateProxy.java | 87 ++++++--------- .../euare/persist/DatabaseGroupProxy.java | 87 ++++++--------- .../euare/persist/DatabasePolicyProxy.java | 87 ++++++--------- .../auth/euare/persist/DatabaseUserProxy.java | 87 ++++++--------- .../persist/entities/AccessKeyEntity.java | 87 ++++++--------- .../euare/persist/entities/AccountEntity.java | 87 ++++++--------- .../persist/entities/CertificateEntity.java | 87 ++++++--------- .../euare/persist/entities/GroupEntity.java | 87 ++++++--------- .../entities/OpenIdProviderEntity.java | 87 ++++++--------- .../euare/persist/entities/PolicyEntity.java | 87 ++++++--------- .../euare/persist/entities/UserEntity.java | 87 ++++++--------- .../auth/euare/principal/EuareGroup.java | 87 ++++++--------- .../eucalyptus/auth/ws/EuareQueryBinding.java | 87 ++++++--------- .../auth/ws/EuareQueryPipeline.java | 87 ++++++--------- .../eucalyptus/auth/ws/EuareReplyQueue.java | 87 ++++++--------- .../auth/euare/ldap/LdapClientTest.java | 87 ++++++--------- .../auth/euare/ldap/LicParserTest.java | 87 ++++++--------- .../compute/conversion/ImportManager.java | 47 +++----- .../msgs/conf/scripts/initialize_cloud.groovy | 87 ++++++--------- .../msgs/conf/scripts/notifications.groovy | 87 ++++++--------- .../conf/scripts/notifications_digest.groovy | 95 +++++++---------- .../msgs/conf/scripts/setup_dbpool.groovy | 87 ++++++--------- .../conf/scripts/setup_dbpool_remote.groovy | 87 ++++++--------- .../msgs/conf/scripts/setup_membership.groovy | 87 ++++++--------- .../conf/scripts/setup_persistence.groovy | 87 ++++++--------- .../scripts/setup_persistence_remote.groovy | 87 ++++++--------- .../java/com/eucalyptus/BaseException.java | 95 +++++++---------- .../java/com/eucalyptus/auth/Accounts.java | 87 ++++++--------- .../com/eucalyptus/auth/AuthException.java | 87 ++++++--------- .../java/com/eucalyptus/auth/Contract.java | 95 +++++++---------- .../java/com/eucalyptus/auth/Debugging.java | 87 ++++++--------- .../com/eucalyptus/auth/LdapException.java | 95 +++++++---------- .../eucalyptus/auth/LicParseException.java | 87 ++++++--------- .../java/com/eucalyptus/auth/Permissions.java | 87 ++++++--------- .../eucalyptus/auth/PolicyParseException.java | 87 ++++++--------- .../eucalyptus/auth/api/BaseLoginModule.java | 87 ++++++--------- .../auth/api/BaseSecurityException.java | 87 ++++++--------- .../auth/api/NoSuchCertificateException.java | 87 ++++++--------- .../com/eucalyptus/auth/api/PolicyEngine.java | 87 ++++++--------- .../com/eucalyptus/auth/json/JsonUtils.java | 87 ++++++--------- .../auth/login/AuthenticationException.java | 87 ++++++--------- .../auth/login/HmacCredentials.java | 87 ++++++--------- .../auth/login/HmacLoginModuleSupport.java | 87 ++++++--------- .../auth/login/Hmacv2LoginModule.java | 87 ++++++--------- .../auth/login/SecurityContext.java | 87 ++++++--------- .../auth/login/WrappedCredentials.java | 87 ++++++--------- .../auth/login/WsSecCredentials.java | 95 +++++++---------- .../auth/login/WsSecLoginModule.java | 87 ++++++--------- .../auth/policy/CachedKeyEvaluator.java | 87 ++++++--------- .../auth/policy/PolicyAnnotationRegistry.java | 87 ++++++--------- .../auth/policy/PolicyEngineImpl.java | 87 ++++++--------- .../eucalyptus/auth/policy/PolicyParser.java | 87 ++++++--------- .../eucalyptus/auth/policy/PolicySpec.java | 87 ++++++--------- .../eucalyptus/auth/policy/PolicyUtils.java | 87 ++++++--------- .../auth/policy/annotation/PolicyAction.java | 95 +++++++---------- .../policy/annotation/PolicyResourceType.java | 95 +++++++---------- .../policy/condition/AddressConditionOp.java | 95 +++++++---------- .../auth/policy/condition/Bool.java | 95 +++++++---------- .../auth/policy/condition/ConditionOp.java | 95 +++++++---------- .../condition/ConditionOpDiscovery.java | 87 ++++++--------- .../auth/policy/condition/Conditions.java | 87 ++++++--------- .../policy/condition/DateConditionOp.java | 95 +++++++---------- .../auth/policy/condition/DateEquals.java | 95 +++++++---------- .../policy/condition/DateGreaterThan.java | 95 +++++++---------- .../condition/DateGreaterThanEquals.java | 95 +++++++---------- .../auth/policy/condition/DateLessThan.java | 95 +++++++---------- .../policy/condition/DateLessThanEquals.java | 95 +++++++---------- .../auth/policy/condition/DateNotEquals.java | 95 +++++++---------- .../auth/policy/condition/IpAddress.java | 95 +++++++---------- .../auth/policy/condition/NotIpAddress.java | 95 +++++++---------- .../policy/condition/NumericConditionOp.java | 95 +++++++---------- .../auth/policy/condition/NumericEquals.java | 95 +++++++---------- .../policy/condition/NumericGreaterThan.java | 87 ++++++--------- .../condition/NumericGreaterThanEquals.java | 87 ++++++--------- .../policy/condition/NumericLessThan.java | 87 ++++++--------- .../condition/NumericLessThanEquals.java | 87 ++++++--------- .../policy/condition/NumericNotEquals.java | 95 +++++++---------- .../policy/condition/PolicyCondition.java | 95 +++++++---------- .../policy/condition/StringConditionOp.java | 95 +++++++---------- .../auth/policy/condition/StringEquals.java | 95 +++++++---------- .../condition/StringEqualsIgnoreCase.java | 95 +++++++---------- .../auth/policy/condition/StringLike.java | 95 +++++++---------- .../policy/condition/StringNotEquals.java | 95 +++++++---------- .../condition/StringNotEqualsIgnoreCase.java | 95 +++++++---------- .../auth/policy/condition/StringNotLike.java | 95 +++++++---------- .../auth/policy/ern/AddressUtil.java | 87 ++++++--------- .../com/eucalyptus/auth/policy/ern/Ern.java | 87 ++++++--------- .../auth/policy/ern/EuareResourceName.java | 87 ++++++--------- .../auth/policy/ern/WildcardResourceName.java | 95 +++++++---------- .../com/eucalyptus/auth/policy/key/Cidr.java | 87 ++++++--------- .../auth/policy/key/CidrParseException.java | 95 +++++++---------- .../auth/policy/key/ContractKey.java | 87 ++++++--------- .../auth/policy/key/ContractKeyEvaluator.java | 87 ++++++--------- .../auth/policy/key/CurrentTime.java | 87 ++++++--------- .../auth/policy/key/Iso8601DateParser.java | 87 ++++++--------- .../com/eucalyptus/auth/policy/key/Key.java | 87 ++++++--------- .../auth/policy/key/KeyDiscovery.java | 87 ++++++--------- .../eucalyptus/auth/policy/key/KeyUtils.java | 87 ++++++--------- .../com/eucalyptus/auth/policy/key/Keys.java | 87 ++++++--------- .../eucalyptus/auth/policy/key/PolicyKey.java | 95 +++++++---------- .../eucalyptus/auth/policy/key/QuotaKey.java | 87 ++++++--------- .../eucalyptus/auth/policy/key/SourceIp.java | 87 ++++++--------- .../eucalyptus/auth/principal/AccessKey.java | 95 +++++++---------- .../auth/principal/AccountFullName.java | 87 ++++++--------- .../auth/principal/Authorization.java | 87 ++++++--------- .../auth/principal/BasePrincipal.java | 87 ++++++--------- .../auth/principal/Certificate.java | 87 ++++++--------- .../eucalyptus/auth/principal/Condition.java | 95 +++++++---------- .../eucalyptus/auth/principal/FullName.java | 87 ++++++--------- .../auth/principal/OpenIdConnectProvider.java | 95 +++++++---------- .../auth/principal/OwnerFullName.java | 95 +++++++---------- .../com/eucalyptus/auth/principal/Policy.java | 95 +++++++---------- .../eucalyptus/auth/principal/Principals.java | 87 ++++++--------- .../com/eucalyptus/auth/principal/User.java | 87 ++++++--------- .../auth/principal/UserFullName.java | 87 ++++++--------- .../eucalyptus/auth/type/RestrictedType.java | 87 ++++++--------- .../java/com/eucalyptus/auth/util/Hashes.java | 87 ++++++--------- .../eucalyptus/auth/util/X509CertHelper.java | 87 ++++++--------- .../java/com/eucalyptus/binding/Binding.java | 87 ++++++--------- .../com/eucalyptus/binding/BindingCache.java | 87 ++++++--------- .../eucalyptus/binding/BindingDiscovery.java | 87 ++++++--------- .../eucalyptus/binding/BindingException.java | 95 +++++++---------- .../eucalyptus/binding/BindingManager.java | 87 ++++++--------- .../com/eucalyptus/binding/HttpEmbedded.java | 95 +++++++---------- .../binding/HttpParameterMapping.java | 95 +++++++---------- .../bootstrap/ArgumentValidationError.java | 95 +++++++---------- .../eucalyptus/bootstrap/BillOfMaterials.java | 87 ++++++--------- .../com/eucalyptus/bootstrap/Bootstrap.java | 87 ++++++--------- .../eucalyptus/bootstrap/BootstrapArgs.java | 87 ++++++--------- .../eucalyptus/bootstrap/BootstrapError.java | 95 +++++++---------- .../bootstrap/BootstrapException.java | 87 ++++++--------- .../eucalyptus/bootstrap/Bootstrapper.java | 87 ++++++--------- .../bootstrap/BootstrapperDiscovery.java | 87 ++++++--------- .../eucalyptus/bootstrap/CanBootstrap.java | 87 ++++++--------- ...CloudControllerColocatingBootstrapper.java | 51 +++------ .../bootstrap/DatabaseBootstrapper.java | 87 ++++++--------- .../com/eucalyptus/bootstrap/Databases.java | 87 ++++++--------- .../eucalyptus/bootstrap/DependsLocal.java | 95 +++++++---------- .../eucalyptus/bootstrap/DependsRemote.java | 95 +++++++---------- .../com/eucalyptus/bootstrap/Handles.java | 95 +++++++---------- .../java/com/eucalyptus/bootstrap/Host.java | 87 ++++++--------- .../java/com/eucalyptus/bootstrap/Hosts.java | 87 ++++++--------- .../NeedsDeferredInitialization.java | 95 +++++++---------- .../eucalyptus/bootstrap/OrderedShutdown.java | 87 ++++++--------- .../com/eucalyptus/bootstrap/Provides.java | 95 +++++++---------- .../com/eucalyptus/bootstrap/RunDuring.java | 95 +++++++---------- .../bootstrap/ServiceJarDiscovery.java | 87 ++++++--------- .../eucalyptus/bootstrap/ShutdownHook.java | 87 ++++++--------- .../bootstrap/SystemBootstrapper.java | 87 ++++++--------- .../com/eucalyptus/bootstrap/SystemIds.java | 87 ++++++--------- .../component/AbstractServiceBuilder.java | 87 ++++++--------- .../eucalyptus/component/BasicService.java | 87 ++++++--------- .../com/eucalyptus/component/Component.java | 87 ++++++--------- .../component/ComponentDiscovery.java | 87 ++++++--------- .../component/ComponentFullName.java | 87 ++++++--------- .../com/eucalyptus/component/ComponentId.java | 87 ++++++--------- .../eucalyptus/component/ComponentIds.java | 87 ++++++--------- .../component/ComponentMessages.java | 87 ++++++--------- .../ComponentRegistrationHandler.java | 87 ++++++--------- .../component/ComponentTransitions.java | 95 +++++++---------- .../com/eucalyptus/component/Components.java | 87 ++++++--------- .../com/eucalyptus/component/Dispatcher.java | 95 +++++++---------- .../component/DummyServiceBuilder.java | 87 ++++++--------- .../component/EphemeralConfiguration.groovy | 87 ++++++--------- .../java/com/eucalyptus/component/Faults.java | 87 ++++++--------- .../component/NoSuchComponentException.java | 95 +++++++---------- .../component/NoSuchServiceException.java | 95 +++++++---------- .../com/eucalyptus/component/Partition.java | 87 ++++++--------- .../com/eucalyptus/component/Partitions.java | 87 ++++++--------- .../component/RegionSpoofingResolver.java | 47 +++----- .../com/eucalyptus/component/Service.java | 87 ++++++--------- .../eucalyptus/component/ServiceBuilder.java | 87 ++++++--------- .../eucalyptus/component/ServiceBuilders.java | 87 ++++++--------- .../component/ServiceConfiguration.java | 87 ++++++--------- .../component/ServiceConfigurations.java | 87 ++++++--------- .../component/ServiceOperations.java | 87 ++++++--------- .../component/ServiceOrderings.java | 47 +++----- .../ServiceRegistrationException.java | 95 +++++++---------- .../eucalyptus/component/ServiceState.java | 87 ++++++--------- .../component/ServiceTransitions.java | 87 ++++++--------- .../com/eucalyptus/component/ServiceUris.java | 87 ++++++--------- .../com/eucalyptus/component/Topology.java | 87 ++++++--------- .../component/TopologyDnsResolver.java | 39 ++----- .../component/annotation/AwsServiceName.java | 51 +++------ .../component/annotation/Description.java | 47 +++----- .../component/auth/SystemCredentials.java | 87 ++++++--------- .../component/events/ServiceEvents.java | 47 +++----- .../eucalyptus/component/fault/Common.java | 87 ++++++--------- .../component/fault/EffectiveValue.java | 95 +++++++---------- .../com/eucalyptus/component/fault/Fault.java | 87 ++++++--------- .../component/fault/FaultBuilderImpl.java | 87 ++++++--------- .../component/fault/FaultField.java | 87 ++++++--------- .../component/fault/FaultFieldName.java | 95 +++++++---------- .../component/fault/FaultLogger.java | 95 +++++++---------- .../component/fault/FaultMessage.java | 87 ++++++--------- .../component/fault/FaultRegistry.java | 87 ++++++--------- .../fault/FaultSubsystemManager.java | 87 ++++++--------- .../groups/ApiEndpointServicesGroup.java | 47 +++----- .../groups/BaseServiceGroupBuilder.java | 47 +++----- .../groups/BaseServiceGroupConfiguration.java | 47 +++----- .../component/groups/ServiceGroup.java | 47 +++----- .../component/groups/ServiceGroupBuilder.java | 47 +++----- .../groups/ServiceGroupConfiguration.java | 47 +++----- .../component/groups/ServiceGroups.java | 47 +++----- .../component/id/ClusterController.java | 87 ++++++--------- .../component/id/ComponentService.java | 95 +++++++---------- .../com/eucalyptus/component/id/Database.java | 87 ++++++--------- .../java/com/eucalyptus/component/id/Dns.java | 95 +++++++---------- .../com/eucalyptus/component/id/Euare.java | 95 +++++++---------- .../eucalyptus/component/id/Eucalyptus.java | 87 ++++++--------- .../com/eucalyptus/component/id/Ldap.java | 95 +++++++---------- .../eucalyptus/component/id/Reporting.java | 95 +++++++---------- .../config/ArbitratorConfiguration.groovy | 87 ++++++--------- .../config/BaseSystemConfiguration.groovy | 95 +++++++---------- .../config/ComponentConfiguration.java | 87 ++++++--------- .../config/ConfigurationService.java | 95 +++++++---------- .../AbstractConfigurableProperty.java | 87 ++++++--------- .../eucalyptus/configurable/Configurable.java | 95 +++++++---------- .../configurable/ConfigurableClass.java | 95 +++++++---------- .../configurable/ConfigurableField.java | 87 ++++++--------- .../configurable/ConfigurableFieldType.java | 95 +++++++---------- .../configurable/ConfigurableIdentifier.java | 95 +++++++---------- .../configurable/ConfigurableProperty.java | 87 ++++++--------- .../ConfigurablePropertyBuilder.java | 95 +++++++---------- .../ConfigurablePropertyException.java | 95 +++++++---------- .../configurable/Configurables.java | 87 ++++++--------- .../MultiDatabasePropertyEntry.java | 87 ++++++--------- .../eucalyptus/configurable/Properties.java | 87 ++++++--------- .../configurable/PropertiesDiscovery.java | 87 ++++++--------- .../configurable/PropertyChangeListener.java | 95 +++++++---------- .../configurable/PropertyChangeListeners.java | 87 ++++++--------- .../configurable/PropertyDirectory.java | 87 ++++++--------- .../configurable/PropertyTypeParser.java | 87 ++++++--------- .../SingletonDatabasePropertyEntry.java | 87 ++++++--------- .../StaticDatabasePropertyEntry.java | 87 ++++++--------- .../configurable/StaticPropertyEntry.java | 87 ++++++--------- .../java/com/eucalyptus/context/Context.java | 87 ++++++--------- .../java/com/eucalyptus/context/Contexts.java | 87 ++++++--------- .../IllegalContextAccessException.java | 95 +++++++---------- .../context/NoSuchContextException.java | 95 +++++++---------- .../eucalyptus/context/ServiceContext.java | 87 ++++++--------- .../ServiceContextConfigurationException.java | 95 +++++++---------- .../context/ServiceContextErrorFilter.java | 95 +++++++---------- .../context/ServiceContextManager.java | 87 ++++++--------- .../context/ServiceDispatchException.java | 87 ++++++--------- .../ServiceInitializationException.java | 95 +++++++---------- .../context/ServiceStateException.java | 95 +++++++---------- .../crypto/BaseSecurityProvider.java | 95 +++++++---------- .../crypto/CertificateProvider.java | 87 ++++++--------- .../java/com/eucalyptus/crypto/Certs.java | 87 ++++++--------- .../java/com/eucalyptus/crypto/Crypto.java | 87 ++++++--------- .../com/eucalyptus/crypto/CryptoProvider.java | 95 +++++++---------- .../crypto/DefaultCryptoProvider.java | 87 ++++++--------- .../java/com/eucalyptus/crypto/Digest.java | 87 ++++++--------- .../main/java/com/eucalyptus/crypto/Hmac.java | 87 ++++++--------- .../com/eucalyptus/crypto/HmacProvider.java | 95 +++++++---------- .../java/com/eucalyptus/crypto/Hmacs.java | 95 +++++++---------- .../java/com/eucalyptus/crypto/KeyStore.java | 87 ++++++--------- .../com/eucalyptus/crypto/Signatures.java | 87 ++++++--------- .../com/eucalyptus/crypto/StringCrypto.java | 87 ++++++--------- .../crypto/util/AbstractKeyStore.java | 87 ++++++--------- .../java/com/eucalyptus/crypto/util/B64.java | 87 ++++++--------- .../eucalyptus/crypto/util/Base64Handler.java | 95 +++++++---------- .../com/eucalyptus/crypto/util/PEMFiles.java | 87 ++++++--------- .../crypto/util/SSLSocketFactoryWrapper.java | 87 ++++++--------- .../crypto/util/SecurityParameter.java | 87 ++++++--------- .../util/SimpleClientX509TrustManager.java | 87 ++++++--------- .../com/eucalyptus/crypto/util/SslSetup.java | 87 ++++++--------- .../eucalyptus/crypto/util/Timestamps.java | 87 ++++++--------- .../eucalyptus/crypto/util/WSSecurity.java | 87 ++++++--------- .../com/eucalyptus/empyrean/Empyrean.java | 87 ++++++--------- .../empyrean/EmpyreanMessages.groovy | 87 ++++++--------- .../eucalyptus/empyrean/EmpyreanService.java | 87 ++++++--------- .../ServiceRegistrationManager.java | 39 ++----- .../ServiceRegistrationMessages.groovy | 87 ++++++--------- .../entities/AbstractPersistent.java | 87 ++++++--------- .../entities/AbstractStatefulPersistent.java | 87 ++++++--------- .../eucalyptus/entities/AccountMetadata.java | 87 ++++++--------- .../entities/DelegatingInterceptor.java | 87 ++++++--------- .../com/eucalyptus/entities/Entities.java | 87 ++++++--------- .../entities/GlobalUserMetadata.java | 47 +++----- .../com/eucalyptus/entities/Interceptors.java | 87 ++++++--------- .../entities/PersistenceContextDiscovery.java | 87 ++++++--------- .../entities/PersistenceContexts.java | 87 ++++++--------- .../entities/PersistenceExceptions.java | 87 ++++++--------- .../RecoverablePersistenceException.java | 95 +++++++---------- .../TransactionCallbackException.java | 95 +++++++---------- .../entities/TransactionException.java | 95 +++++++---------- .../TransactionExecutionException.java | 95 +++++++---------- .../TransactionInternalException.java | 95 +++++++---------- .../com/eucalyptus/entities/Transactions.java | 87 ++++++--------- .../entities/TransientEntityException.java | 95 +++++++---------- .../com/eucalyptus/entities/UserMetadata.java | 87 ++++++--------- .../event/AbstractNamedRegistry.java | 87 ++++++--------- .../java/com/eucalyptus/event/ClockTick.java | 95 +++++++---------- .../main/java/com/eucalyptus/event/Event.java | 95 +++++++---------- .../event/EventFailedException.java | 95 +++++++---------- .../com/eucalyptus/event/EventListener.java | 95 +++++++---------- .../event/EventListenerDiscovery.java | 87 ++++++--------- .../com/eucalyptus/event/GenericEvent.java | 87 ++++++--------- .../main/java/com/eucalyptus/event/Hertz.java | 87 ++++++--------- .../eucalyptus/event/ListenerRegistry.java | 87 ++++++--------- .../java/com/eucalyptus/event/Listeners.java | 87 ++++++--------- .../eucalyptus/event/ReferentialEvent.java | 95 +++++++---------- .../event/StatefulNamedRegistry.java | 87 ++++++--------- .../com/eucalyptus/event/SystemClock.java | 87 ++++++--------- .../eucalyptus/http/MappingHttpMessage.java | 87 ++++++--------- .../eucalyptus/http/MappingHttpRequest.java | 87 ++++++--------- .../eucalyptus/http/MappingHttpResponse.java | 87 ++++++--------- .../images/NoSuchImageException.java | 95 +++++++---------- .../com/eucalyptus/records/BaseRecord.java | 87 ++++++--------- .../com/eucalyptus/records/EventClass.java | 95 +++++++---------- .../com/eucalyptus/records/EventRecord.java | 87 ++++++--------- .../com/eucalyptus/records/EventType.java | 87 ++++++--------- .../com/eucalyptus/records/LogFileRecord.java | 87 ++++++--------- .../java/com/eucalyptus/records/Logs.java | 87 ++++++--------- .../java/com/eucalyptus/records/Record.java | 87 ++++++--------- .../com/eucalyptus/records/RecordFilter.java | 95 +++++++---------- .../com/eucalyptus/records/RecordLevel.java | 87 ++++++--------- .../com/eucalyptus/scripting/Groovyness.java | 87 ++++++--------- .../ScriptExecutionFailedException.java | 87 ++++++--------- .../main/java/com/eucalyptus/system/Ats.java | 87 ++++++--------- .../com/eucalyptus/system/BaseDirectory.java | 87 ++++++--------- .../system/DirectoryBootstrapper.java | 87 ++++++--------- .../com/eucalyptus/system/EucaLayout.java | 87 ++++++--------- .../com/eucalyptus/system/SubDirectory.java | 87 ++++++--------- .../system/log/LoggingResetter.java | 87 ++++++--------- .../java/com/eucalyptus/util/ByteArray.java | 87 ++++++--------- .../java/com/eucalyptus/util/Callback.java | 87 ++++++--------- .../java/com/eucalyptus/util/Classes.java | 87 ++++++--------- .../java/com/eucalyptus/util/Composite.java | 95 +++++++---------- .../eucalyptus/util/CompositeHelper.groovy | 87 ++++++--------- .../java/com/eucalyptus/util/Composites.java | 87 ++++++--------- .../com/eucalyptus/util/DNSProperties.java | 87 ++++++--------- .../main/java/com/eucalyptus/util/Dates.java | 51 +++------ .../main/java/com/eucalyptus/util/Emails.java | 87 ++++++--------- .../util/EucalyptusCloudException.java | 95 +++++++---------- .../util/EucalyptusClusterException.java | 95 +++++++---------- ...calyptusUnsupportedOperationException.java | 95 +++++++---------- .../java/com/eucalyptus/util/Exceptions.java | 87 ++++++--------- .../java/com/eucalyptus/util/Expendable.java | 95 +++++++---------- .../com/eucalyptus/util/ExposedCommand.java | 95 +++++++---------- .../main/java/com/eucalyptus/util/Fields.java | 95 +++++++---------- .../java/com/eucalyptus/util/Filterable.java | 95 +++++++---------- .../java/com/eucalyptus/util/FinalReturn.java | 95 +++++++---------- .../java/com/eucalyptus/util/HasFullName.java | 95 +++++++---------- .../java/com/eucalyptus/util/HasName.java | 95 +++++++---------- .../com/eucalyptus/util/HasNaturalId.java | 87 ++++++--------- .../java/com/eucalyptus/util/HasParent.java | 95 +++++++---------- .../com/eucalyptus/util/HasSideEffect.java | 95 +++++++---------- .../java/com/eucalyptus/util/Internets.java | 87 ++++++--------- .../util/InvalidCredentialsException.java | 95 +++++++---------- .../java/com/eucalyptus/util/LogUtil.groovy | 87 ++++++--------- .../java/com/eucalyptus/util/Mappable.java | 95 +++++++---------- .../main/java/com/eucalyptus/util/Mbeans.java | 87 ++++++--------- .../com/eucalyptus/util/NoopPreferences.java | 87 ++++++--------- .../util/NoopPreferencesFactory.java | 95 +++++++---------- .../java/com/eucalyptus/util/Numbers.java | 87 ++++++--------- .../com/eucalyptus/util/RESTException.java | 87 ++++++--------- .../com/eucalyptus/util/RestrictedTypes.java | 87 ++++++--------- .../com/eucalyptus/util/ServiceProcess.java | 87 ++++++--------- .../java/com/eucalyptus/util/Subnets.java | 87 ++++++--------- .../java/com/eucalyptus/util/Templates.java | 87 ++++++--------- .../com/eucalyptus/util/TimedEvictionSet.java | 87 ++++++--------- .../main/java/com/eucalyptus/util/Timers.java | 87 ++++++--------- .../src/main/java/com/eucalyptus/util/Tx.java | 95 +++++++---------- .../java/com/eucalyptus/util/TypeMapper.java | 87 ++++++--------- .../java/com/eucalyptus/util/TypeMappers.java | 87 ++++++--------- .../java/com/eucalyptus/util/UniqueIds.java | 87 ++++++--------- .../java/com/eucalyptus/util/UserDatas.java | 51 +++------ .../java/com/eucalyptus/util/XMLParser.java | 87 ++++++--------- .../eucalyptus/util/async/AsyncRequest.java | 87 ++++++--------- .../util/async/AsyncRequestHandler.java | 87 ++++++--------- .../eucalyptus/util/async/AsyncRequests.java | 87 ++++++--------- .../util/async/AsyncResponseFuture.java | 87 ++++++--------- .../util/async/BroadcastCallback.java | 95 +++++++---------- .../util/async/CallbackFactory.java | 95 +++++++---------- .../util/async/CallbackListenerSequence.java | 87 ++++++--------- .../com/eucalyptus/util/async/Callbacks.java | 87 ++++++--------- .../util/async/CheckedListenableFuture.java | 87 ++++++--------- .../util/async/ConnectionException.java | 87 ++++++--------- .../com/eucalyptus/util/async/Factory.java | 95 +++++++---------- .../util/async/FailedRequestException.java | 95 +++++++---------- .../util/async/MessageCallback.java | 87 ++++++--------- .../java/com/eucalyptus/util/async/NOOP.java | 87 ++++++--------- .../util/async/NoResponseException.java | 95 +++++++---------- .../eucalyptus/util/async/RemoteCallback.java | 87 ++++++--------- .../util/async/RemoteCallbackFactory.java | 95 +++++++---------- .../com/eucalyptus/util/async/Request.java | 87 ++++++--------- .../util/async/RequestException.java | 87 ++++++--------- .../eucalyptus/util/async/RequestHandler.java | 95 +++++++---------- .../async/RequestInitializationException.java | 95 +++++++---------- .../async/RetryableConnectionException.java | 87 ++++++--------- .../util/async/SubjectMessageCallback.java | 87 ++++++--------- .../async/SubjectRemoteCallbackFactory.java | 95 +++++++---------- .../util/async/UnconditionalCallback.java | 95 +++++++---------- .../async/UnknownMessageTypeException.java | 87 ++++++--------- .../GenericCheckedListenableFuture.java | 95 +++++++---------- .../com/eucalyptus/util/dns/DnsResolvers.java | 47 +++----- .../util/dns/DomainNameRecords.java | 47 +++----- .../com/eucalyptus/util/dns/DomainNames.java | 87 ++++++--------- .../util/dns/NameserverResolver.java | 51 +++------ .../util/fsm/AbstractTransitionAction.java | 87 ++++++--------- .../util/fsm/AtomicMarkedState.java | 87 ++++++--------- .../com/eucalyptus/util/fsm/Automata.java | 87 ++++++--------- .../util/fsm/ExistingTransitionException.java | 95 +++++++---------- .../eucalyptus/util/fsm/HasStateMachine.java | 95 +++++++---------- .../eucalyptus/util/fsm/SplitTransition.java | 87 ++++++--------- .../com/eucalyptus/util/fsm/StateMachine.java | 95 +++++++---------- .../util/fsm/StateMachineBuilder.java | 87 ++++++--------- .../eucalyptus/util/fsm/TransitionAction.java | 87 ++++++--------- .../util/fsm/TransitionException.java | 95 +++++++---------- .../util/fsm/TransitionHandler.java | 87 ++++++--------- .../eucalyptus/util/fsm/TransitionImpl.java | 87 ++++++--------- .../util/fsm/TransitionListener.java | 87 ++++++--------- .../util/fsm/TransitionListenerException.java | 95 +++++++---------- .../eucalyptus/util/fsm/TransitionRecord.java | 95 +++++++---------- .../eucalyptus/util/fsm/TransitionRule.java | 87 ++++++--------- .../com/eucalyptus/util/fsm/Transitions.java | 87 ++++++--------- .../util/techpreview/TechPreviews.java | 47 +++----- .../main/java/com/eucalyptus/ws/Client.java | 95 +++++++---------- .../eucalyptus/ws/EucalyptusRemoteFault.java | 87 ++++++--------- .../main/java/com/eucalyptus/ws/Handlers.java | 87 ++++++--------- .../ws/ServiceNotReadyException.java | 87 ++++++--------- .../com/eucalyptus/ws/StackConfiguration.java | 87 ++++++--------- .../eucalyptus/ws/TransportDefinition.java | 95 +++++++---------- .../java/com/eucalyptus/ws/WebServices.java | 87 ++++++--------- .../eucalyptus/ws/WebServicesException.java | 87 ++++++--------- .../com/eucalyptus/ws/client/NioClient.java | 87 ++++++--------- .../ws/client/ServiceDispatcher.java | 87 ++++++--------- .../ws/handlers/BindingHandler.java | 87 ++++++--------- .../ws/handlers/ClusterWsSecHandler.java | 87 ++++++--------- .../eucalyptus/ws/handlers/HmacHandler.java | 87 ++++++--------- .../ws/handlers/InternalWsSecHandler.java | 87 ++++++--------- .../ws/handlers/MessageStackHandler.java | 87 ++++++--------- .../ws/handlers/NodeWsSecHandler.java | 87 ++++++--------- .../ws/handlers/QueryTimestampHandler.java | 87 ++++++--------- .../ws/handlers/ResponseHandler.java | 95 +++++++---------- .../handlers/RestfulMarshallingHandler.java | 87 ++++++--------- .../ws/handlers/SoapMarshallingHandler.java | 87 ++++++--------- .../ws/handlers/UserWsSecHandler.java | 95 +++++++---------- .../eucalyptus/ws/handlers/WsSecHandler.java | 87 ++++++--------- .../ws/handlers/http/HttpException.java | 87 ++++++--------- .../ws/handlers/http/HttpUtils.java | 87 ++++++--------- .../handlers/http/NioHttpRequestEncoder.java | 87 ++++++--------- .../ws/protocol/AddressingHandler.java | 87 ++++++--------- .../ws/protocol/BaseQueryBinding.java | 87 ++++++--------- .../ws/protocol/OperationParameter.java | 87 ++++++--------- .../ws/protocol/RequiredQueryParams.java | 95 +++++++---------- .../eucalyptus/ws/protocol/SoapHandler.java | 87 ++++++--------- .../ws/server/DuplicatePipelineException.java | 95 +++++++---------- .../ws/server/FilteredPipeline.java | 87 ++++++--------- .../ws/server/LegacyHBPipeline.java | 87 ++++++--------- .../ws/server/MessageStatistics.java | 87 ++++++--------- .../ws/server/NioServerHandler.java | 87 ++++++--------- .../server/NoAcceptingPipelineException.java | 95 +++++++---------- .../com/eucalyptus/ws/server/Pipelines.java | 87 ++++++--------- .../server/ServiceAccessLoggingHandler.java | 51 +++------ .../ws/server/ServiceContextHandler.java | 87 ++++++--------- .../ws/server/ServiceHackeryHandler.java | 87 ++++++--------- .../eucalyptus/ws/util/CredentialProxy.java | 87 ++++++--------- .../com/eucalyptus/ws/util/HmacUtils.java | 87 ++++++--------- .../com/eucalyptus/ws/util/ReplyQueue.java | 87 ++++++--------- .../com/eucalyptus/ws/util/RequestQueue.java | 95 +++++++---------- .../edu/ucsb/eucalyptus/cloud/Extra.groovy | 87 ++++++--------- .../cloud/entities/SystemConfiguration.java | 87 ++++++--------- .../edu/ucsb/eucalyptus/constants/IsData.java | 95 +++++++---------- .../edu/ucsb/eucalyptus/msgs/BaseData.java | 95 +++++++---------- .../edu/ucsb/eucalyptus/msgs/BaseMessage.java | 87 ++++++--------- .../edu/ucsb/eucalyptus/msgs/HasRequest.java | 95 +++++++---------- .../edu/ucsb/eucalyptus/msgs/Messages.groovy | 87 ++++++--------- .../eucalyptus/msgs/StreamedBaseMessage.java | 87 ++++++--------- .../msgs/src/test/groovy/dump_heap.groovy | 95 +++++++---------- .../msgs/src/test/groovy/sync_test.groovy | 87 ++++++--------- .../auth/login/HmacLoginModuleTest.java | 87 ++++++--------- .../auth/policy/PolicyParserTest.java | 87 ++++++--------- .../eucalyptus/crypto/StringCryptoTest.java | 87 ++++++--------- .../eucalyptus/crypto/util/SslUtilsTest.java | 87 ++++++--------- .../NotificationsMessages.groovy | 87 ++++++--------- .../notifications/NotificationsService.java | 87 ++++++--------- .../objectstorage/ObjectStorage.java | 87 ++++++--------- .../GenericS3ClientFactoryConfiguration.java | 87 ++++++--------- .../objectstorage/entities/CorsRule.java | 87 ++++++--------- .../objectstorage/entities/LifecycleRule.java | 87 ++++++--------- .../entities/ObjectStorageConfiguration.java | 87 ++++++--------- .../ObjectStorageGlobalConfiguration.java | 87 ++++++--------- .../objectstorage/entities/ScheduledJob.java | 87 ++++++--------- .../objectstorage/entities/TorrentInfo.java | 87 ++++++--------- .../exceptions/ObjectStorageException.java | 87 ++++++--------- .../msgs/ObjectStorageDataMessage.java | 87 ++++++--------- .../msgs/ObjectStorageDataMessenger.java | 87 ++++++--------- .../msgs/ObjectStorageDataQueue.java | 95 +++++++---------- .../msgs/ObjectStorageMonitor.java | 87 ++++++--------- .../msgs/OsgConfigurationMessages.groovy | 87 ++++++--------- .../objectstorage/policy/S3ResourceName.java | 87 ++++++--------- .../PoolableProviderClientFactory.java | 87 ++++++--------- .../objectstorage/util/OSGUtil.java | 87 ++++++--------- .../ObjectStorageBucketLogger.java | 87 ++++++--------- .../bittorrent/TorrentClient.java | 87 ++++++--------- .../bittorrent/TorrentCreator.java | 87 ++++++--------- .../objectstorage/bittorrent/Torrents.java | 87 ++++++--------- .../objectstorage/bittorrent/Tracker.java | 87 ++++++--------- .../ObjectStorageSchedulerManager.java | 87 ++++++--------- .../bootstrap/OsgBootstrapper.java | 87 ++++++--------- .../objectstorage/config/OsgBuilder.java | 87 ++++++--------- .../jobs/LifecycleReaperJob.java | 87 ++++++--------- .../jobs/MainBucketReaperJob.java | 87 ++++++--------- .../jobs/MainObjectReaperJob.java | 87 ++++++--------- .../metadata/BucketCorsManager.java | 87 ++++++--------- .../metadata/BucketLifecycleManager.java | 87 ++++++--------- .../metadata/BucketNameValidatorRepo.java | 87 ++++++--------- .../metadata/DbBucketCorsManagerImpl.java | 87 ++++++--------- .../DbBucketLifecycleManagerImpl.java | 87 ++++++--------- .../objectstorage/metadata/Validator.java | 95 +++++++---------- .../pipeline/ObjectStorageDELETEPipeline.java | 87 ++++++--------- .../ObjectStorageFormPOSTPipeline.java | 87 ++++++--------- .../pipeline/ObjectStorageGETPipeline.java | 87 ++++++--------- .../pipeline/ObjectStorageHEADPipeline.java | 87 ++++++--------- .../ObjectStorageOPTIONSPipeline.java | 87 ++++++--------- .../ObjectStoragePUTDataPipeline.java | 87 ++++++--------- .../ObjectStoragePUTMetadataPipeline.java | 87 ++++++--------- .../pipeline/ObjectStorageRESTPipeline.java | 87 ++++++--------- .../auth/ObjectStorageLoginModule.java | 87 ++++++--------- .../auth/ObjectStorageWrappedCredentials.java | 87 ++++++--------- .../binding/ObjectStorageDELETEBinding.java | 87 ++++++--------- .../binding/ObjectStorageFormPOSTBinding.java | 87 ++++++--------- .../binding/ObjectStorageGETBinding.java | 87 ++++++--------- .../binding/ObjectStorageHEADBinding.java | 87 ++++++--------- .../binding/ObjectStorageOPTIONSBinding.java | 87 ++++++--------- .../binding/ObjectStoragePUTBinding.java | 87 ++++++--------- .../binding/ObjectStorageRESTBinding.java | 87 ++++++--------- .../HttpThresholdBufferingAggregator.java | 87 ++++++--------- ...ObjectStorageAuthenticationAggregator.java | 87 ++++++--------- .../ObjectStorageAuthenticationHandler.java | 87 ++++++--------- .../ObjectStorageBasicOutboundHandler.java | 87 ++++++--------- .../ObjectStorageDELETEOutboundHandler.java | 87 ++++++--------- ...tStorageFormPOSTAuthenticationHandler.java | 87 ++++++--------- .../ObjectStorageGETOutboundHandler.java | 87 ++++++--------- .../ObjectStorageHEADOutboundHandler.java | 87 ++++++--------- ...bjectStorageMetadataAggregatorHandler.java | 87 ++++++--------- .../ObjectStorageOPTIONSOutboundHandler.java | 87 ++++++--------- ...ObjectStorageOutboundExceptionHandler.java | 87 ++++++--------- .../ObjectStorageOutboundHandler.java | 87 ++++++--------- .../handlers/UploadPolicyChecker.java | 87 ++++++--------- ...tStorageAuthenticationAggregatorStage.java | 87 ++++++--------- .../ObjectStorageDELETEBindingStage.java | 87 ++++++--------- .../ObjectStorageDELETEOutboundStage.java | 87 ++++++--------- .../ObjectStorageFormPOSTBindingStage.java | 87 ++++++--------- .../ObjectStorageFormPOSTOutboundStage.java | 87 ++++++--------- ...torageFormPOSTUserAuthenticationStage.java | 87 ++++++--------- .../stages/ObjectStorageGETBindingStage.java | 87 ++++++--------- .../stages/ObjectStorageGETOutboundStage.java | 87 ++++++--------- .../stages/ObjectStorageHEADBindingStage.java | 87 ++++++--------- .../ObjectStorageHEADOutboundStage.java | 87 ++++++--------- .../ObjectStorageMetadataAggregatorStage.java | 87 ++++++--------- .../ObjectStorageOPTIONSBindingStage.java | 87 ++++++--------- .../ObjectStorageOPTIONSOutboundStage.java | 87 ++++++--------- .../stages/ObjectStorageOutboundStage.java | 87 ++++++--------- .../stages/ObjectStoragePUTBindingStage.java | 87 ++++++--------- .../stages/ObjectStoragePUTOutboundStage.java | 87 ++++++--------- .../stages/ObjectStorageRESTBindingStage.java | 87 ++++++--------- .../ObjectStorageRESTLoggerInbound.java | 87 ++++++--------- .../ObjectStorageRESTLoggerOutbound.java | 87 ++++++--------- .../ObjectStorageUserAuthenticationStage.java | 87 ++++++--------- .../policy/BucketNumberQuotaKey.java | 87 ++++++--------- .../policy/BucketObjectNumberQuotaKey.java | 87 ++++++--------- .../policy/BucketSizeQuotaKey.java | 87 ++++++--------- .../policy/BucketTotalSizeQuotaKey.java | 87 ++++++--------- .../objectstorage/policy/MaxKeys.java | 87 ++++++--------- .../policy/ObjectStorageQuotaUtil.java | 87 ++++++--------- .../walrus/WalrusProviderClient.java | 87 ++++++--------- .../objectstorage/OSGBucketTests.java | 95 +++++++---------- .../ObjectStorageGatewayTest.java | 87 ++++++--------- .../eucalyptus/objectstorage/ObjectTest.java | 87 ++++++--------- .../ObjectStorageSchedulerManagerTest.java | 87 ++++++--------- .../metadata/BucketNameValidatorRepoTest.java | 87 ++++++--------- .../postgresql/conf/scripts/setup_db.groovy | 87 ++++++--------- .../PostgreSQLSSLSocketFactory.java | 87 ++++++--------- .../java/com/eucalyptus/reporting/Period.java | 87 ++++++--------- .../eucalyptus/reporting/ReportFormat.java | 95 +++++++---------- .../eucalyptus/reporting/ReportGenerator.java | 87 ++++++--------- .../art/entity/AccountArtEntity.java | 87 ++++++--------- .../art/entity/AvailabilityZoneArtEntity.java | 87 ++++++--------- .../art/entity/BucketUsageArtEntity.java | 87 ++++++--------- .../art/entity/ClusterArtEntity.java | 87 ++++++--------- .../art/entity/ElasticIpArtEntity.java | 87 ++++++--------- .../art/entity/ElasticIpUsageArtEntity.java | 87 ++++++--------- .../art/entity/InstanceArtEntity.java | 87 ++++++--------- .../art/entity/InstanceUsageArtEntity.java | 87 ++++++--------- .../reporting/art/entity/ReportArtEntity.java | 87 ++++++--------- .../art/entity/UsageTotalsArtEntity.java | 87 ++++++--------- .../reporting/art/entity/UserArtEntity.java | 87 ++++++--------- .../reporting/art/entity/VolumeArtEntity.java | 87 ++++++--------- .../entity/VolumeSnapshotUsageArtEntity.java | 87 ++++++--------- .../art/entity/VolumeUsageArtEntity.java | 87 ++++++--------- .../art/generator/InstanceArtGenerator.java | 87 ++++++--------- .../art/generator/S3ArtGenerator.java | 87 ++++++--------- .../art/generator/VolumeArtGenerator.java | 87 ++++++--------- .../generator/VolumeSnapshotArtGenerator.java | 87 ++++++--------- .../art/renderer/InstanceRenderer.java | 87 ++++++--------- .../reporting/art/renderer/Renderer.java | 95 +++++++---------- .../art/renderer/RendererFactory.java | 87 ++++++--------- .../reporting/art/renderer/S3Renderer.java | 87 ++++++--------- .../art/renderer/VolumeRenderer.java | 87 ++++++--------- .../art/renderer/VolumeSnapshotRenderer.java | 87 ++++++--------- .../art/renderer/document/HtmlDocument.java | 87 ++++++--------- .../art/util/AttachDurationCalculator.java | 87 ++++++--------- .../art/util/DurationCalculator.java | 87 ++++++--------- .../reporting/art/util/StartEndTimes.java | 87 ++++++--------- .../domain/ReportingComputeDomainModel.java | 87 ++++++--------- .../eucalyptus/reporting/units/SizeUnit.java | 87 ++++++--------- .../eucalyptus/reporting/units/TimeUnit.java | 87 ++++++--------- .../eucalyptus/reporting/units/UnitUtil.java | 95 +++++++---------- .../com/eucalyptus/reporting/units/Units.java | 87 ++++++--------- .../com/eucalyptus/reporting/CsvChecker.java | 87 ++++++--------- .../reporting/src/test/sh/within_error.bc | 95 +++++++---------- .../eucalyptus/storage/common/CallBack.java | 95 +++++++---------- .../storage/common/CheckerTask.java | 87 ++++++--------- .../storage/common/ChunkedDataFile.java | 95 +++++++---------- .../storage/common/ChunkedDataStream.java | 87 ++++++--------- .../storage/common/CompressedChunkedFile.java | 87 ++++++--------- .../storage/common/DateFormatter.java | 87 ++++++--------- .../eucalyptus/storage/common/fs/FileIO.java | 95 +++++++---------- .../storage/common/fs/FileReader.java | 87 ++++++--------- .../storage/common/fs/FileWriter.java | 87 ++++++--------- .../storage/msgs/BucketLogData.java | 87 ++++++--------- .../TroubleshootingBootstrapper.java | 87 ++++++--------- .../troubleshooting/TestFaultTrigger.java | 87 ++++++--------- .../com/eucalyptus/walrus/WalrusBackend.java | 95 +++++++---------- .../walrus/WalrusConfiguration.groovy | 87 ++++++--------- .../walrus/entities/BucketInfo.java | 87 ++++++--------- .../eucalyptus/walrus/entities/DRBDInfo.java | 87 ++++++--------- .../walrus/entities/MetaDataInfo.java | 87 ++++++--------- .../walrus/entities/ObjectInfo.java | 87 ++++++--------- .../eucalyptus/walrus/entities/PartInfo.java | 87 ++++++--------- .../walrus/entities/WalrusInfo.java | 87 ++++++--------- .../exceptions/AccessDeniedException.java | 87 ++++++--------- .../BucketAlreadyExistsException.java | 87 ++++++--------- .../BucketAlreadyOwnedByYouException.java | 95 +++++++---------- .../exceptions/BucketNotEmptyException.java | 87 ++++++--------- .../exceptions/ContentMismatchException.java | 95 +++++++---------- .../exceptions/DecryptionFailedException.java | 95 +++++++---------- .../EntityAlreadyExistsException.java | 87 ++++++--------- .../exceptions/EntityTooLargeException.java | 87 ++++++--------- .../ImageAlreadyExistsException.java | 95 +++++++---------- .../InlineDataTooLargeException.java | 95 +++++++---------- .../exceptions/InternalErrorException.java | 95 +++++++---------- .../exceptions/InvalidArgumentException.java | 87 ++++++--------- .../InvalidBucketNameException.java | 95 +++++++---------- .../exceptions/InvalidPartException.java | 87 ++++++--------- .../exceptions/InvalidRangeException.java | 95 +++++++---------- ...nvalidTargetBucketForLoggingException.java | 87 ++++++--------- .../exceptions/NoSuchBucketException.java | 95 +++++++---------- .../exceptions/NoSuchEntityException.java | 87 ++++++--------- ...NoSuchLifecycleConfigurationException.java | 95 +++++++---------- .../exceptions/NoSuchUploadException.java | 87 ++++++--------- .../exceptions/NotAuthorizedException.java | 95 +++++++---------- .../exceptions/NotImplementedException.java | 87 ++++++--------- .../exceptions/NotModifiedException.java | 95 +++++++---------- .../walrus/exceptions/NotReadyException.java | 95 +++++++---------- .../PreconditionFailedException.java | 87 ++++++--------- .../exceptions/TooManyBucketsException.java | 95 +++++++---------- .../walrus/exceptions/WalrusException.java | 87 ++++++--------- .../com/eucalyptus/walrus/msgs/Walrus.groovy | 87 ++++++--------- .../msgs/WalrusConfigurationMessages.groovy | 95 +++++++---------- .../walrus/msgs/WalrusDataMessage.java | 87 ++++++--------- .../walrus/msgs/WalrusDataMessenger.java | 87 ++++++--------- .../walrus/msgs/WalrusDataQueue.java | 95 +++++++---------- .../eucalyptus/walrus/msgs/WalrusMonitor.java | 87 ++++++--------- .../walrus/util/WalrusProperties.java | 87 ++++++--------- .../com/eucalyptus/walrus/StorageManager.java | 87 ++++++--------- .../com/eucalyptus/walrus/WalrusControl.java | 87 ++++++--------- .../eucalyptus/walrus/WalrusFSManager.java | 87 ++++++--------- .../walrus/auth/WalrusLoginModule.java | 87 ++++++--------- .../walrus/auth/WalrusWrappedCredentials.java | 87 ++++++--------- .../walrus/bootstrap/WalrusBootstrapper.java | 87 ++++++--------- .../walrus/config/WalrusBuilder.java | 87 ++++++--------- .../pipeline/WalrusAuthenticationHandler.java | 87 ++++++--------- .../pipeline/WalrusOutboundHandler.java | 87 ++++++--------- .../walrus/pipeline/WalrusRESTBinding.java | 87 ++++++--------- .../walrus/pipeline/WalrusRESTPipeline.java | 87 ++++++--------- .../pipeline/stages/WalrusOutboundStage.java | 87 ++++++--------- .../stages/WalrusRESTBindingStage.java | 87 ++++++--------- .../stages/WalrusUserAuthenticationStage.java | 87 ++++++--------- .../walrus/storage/DRBDStorageManager.java | 87 ++++++--------- .../storage/FileSystemStorageManager.java | 87 ++++++--------- .../eucalyptus/walrus/util/WalrusUtil.java | 87 ++++++--------- .../eucalyptus/walrus/tests/BukkitTest.java | 87 ++++++--------- .../eucalyptus/walrus/tests/ObjectTest.java | 87 ++++++--------- .../walrus/tests/WalrusBucketTests.java | 95 +++++++---------- .../ws/DeferredPropertiesBootstrapper.java | 87 ++++++--------- .../ws/InvalidOperationException.java | 95 +++++++---------- .../ws/MethodNotAllowedException.java | 87 ++++++--------- .../ws/RemoteConfigurationException.java | 95 +++++++---------- .../eucalyptus/ws/ServiceBootstrapper.java | 87 ++++++--------- .../pipeline/InternalClientPipeline.java | 87 ++++++--------- .../ws/handlers/BrokerBindingHandler.java | 87 ++++++--------- .../ws/handlers/ChannelStateMonitor.java | 87 ++++++--------- .../ws/handlers/NioHttpResponseDecoder.java | 95 +++++++---------- .../ws/handlers/POSTRequestContext.java | 87 ++++++--------- .../eucalyptus/ws/handlers/TestHandler.java | 87 ++++++--------- .../wssecurity/BrokerWsSecHandler.java | 87 ++++++--------- .../stages/HmacUserAuthenticationStage.java | 87 ++++++--------- .../stages/SoapUserAuthenticationStage.java | 95 +++++++---------- .../eucalyptus/ws/stages/UnrollableStage.java | 95 +++++++---------- .../com/eucalyptus/ws/util/ChannelUtil.java | 87 ++++++--------- cluster/CCclient.c | 87 ++++++--------- cluster/cc-client-marshal-adb.c | 87 ++++++--------- cluster/cc-client-marshal.h | 87 ++++++--------- cluster/config-cc.h | 87 ++++++--------- cluster/handlers-state.c | 87 ++++++--------- cluster/handlers-state.h | 87 ++++++--------- cluster/handlers.c | 87 ++++++--------- cluster/handlers.h | 87 ++++++--------- cluster/server-marshal-state.c | 87 ++++++--------- cluster/server-marshal-state.h | 87 ++++++--------- cluster/server-marshal.c | 87 ++++++--------- cluster/server-marshal.h | 87 ++++++--------- cluster/shutdownCC.c | 87 ++++++--------- devel/fsm-pathTo.groovy | 87 ++++++--------- doxygen/extra_pages/changelog.txt | 88 ++++++--------- doxygen/extra_pages/cluster_project.txt | 96 +++++++---------- doxygen/extra_pages/doxygen.txt | 88 ++++++--------- doxygen/extra_pages/eucanetd_project.txt | 96 +++++++---------- doxygen/extra_pages/install.txt | 88 ++++++--------- doxygen/extra_pages/license.txt | 88 ++++++--------- doxygen/extra_pages/node_project.txt | 96 +++++++---------- doxygen/extra_pages/readme.txt | 88 ++++++--------- doxygen/extra_pages/vmware_broker_project.txt | 96 +++++++---------- gatherlog/GLclient.c | 87 ++++++--------- gatherlog/gl-client-marshal-adb.c | 87 ++++++--------- gatherlog/gl-client-marshal.h | 87 ++++++--------- gatherlog/handlers.c | 87 ++++++--------- gatherlog/handlers.h | 87 ++++++--------- gatherlog/server-marshal.c | 87 ++++++--------- gatherlog/server-marshal.h | 87 ++++++--------- node/NCclient.c | 87 ++++++--------- node/client-marshal-adb.c | 87 ++++++--------- node/client-marshal-fake.c | 87 ++++++--------- node/client-marshal-local.c | 87 ++++++--------- node/client-marshal.h | 87 ++++++--------- node/handlers.h | 91 ++++++---------- node/handlers_default.c | 87 ++++++--------- node/handlers_kvm.c | 87 ++++++--------- node/handlers_xen.c | 87 ++++++--------- node/hooks.c | 87 ++++++--------- node/hooks.h | 87 ++++++--------- node/libvirt_nag.c | 87 ++++++--------- node/libvirt_tortura.c | 87 ++++++--------- node/server-marshal.c | 87 ++++++--------- node/server-marshal.h | 87 ++++++--------- node/test.c | 87 ++++++--------- node/test_nc.c | 87 ++++++--------- node/xml.c | 87 ++++++--------- node/xml.h | 87 ++++++--------- storage/OSGclient.c | 87 ++++++--------- storage/SCclient.c | 87 ++++++--------- storage/blobstore.c | 87 ++++++--------- storage/blobstore.h | 87 ++++++--------- storage/diskutil.c | 87 ++++++--------- storage/diskutil.h | 87 ++++++--------- storage/ebs_utils.c | 87 ++++++--------- storage/ebs_utils.h | 87 ++++++--------- storage/http.c | 87 ++++++--------- storage/http.h | 87 ++++++--------- storage/iscsi.c | 87 ++++++--------- storage/iscsi.h | 87 ++++++--------- storage/map.c | 87 ++++++--------- storage/map.h | 87 ++++++--------- storage/objectstorage.c | 87 ++++++--------- storage/objectstorage.h | 87 ++++++--------- storage/sc-client-marshal-adb.c | 87 ++++++--------- storage/sc-client-marshal.h | 87 ++++++--------- storage/storage-controller.c | 87 ++++++--------- storage/storage-controller.h | 87 ++++++--------- storage/storage-windows.c | 87 ++++++--------- storage/storage-windows.h | 87 ++++++--------- storage/vbr.c | 87 ++++++--------- storage/vbr.h | 87 ++++++--------- tools/template.c | 87 ++++++--------- tools/template.h | 87 ++++++--------- util/adb-helpers.h | 87 ++++++--------- util/adb-service-helpers.h | 87 ++++++--------- util/atomic_file.c | 87 ++++++--------- util/atomic_file.h | 87 ++++++--------- util/config.c | 87 ++++++--------- util/config.h | 87 ++++++--------- util/data.c | 87 ++++++--------- util/data.h | 87 ++++++--------- util/euca_auth.c | 87 ++++++--------- util/euca_auth.h | 87 ++++++--------- util/euca_axis.c | 87 ++++++--------- util/euca_axis.h | 87 ++++++--------- util/euca_file.c | 87 ++++++--------- util/euca_file.h | 87 ++++++--------- util/euca_network.c | 87 ++++++--------- util/euca_network.h | 87 ++++++--------- util/euca_rootwrap.c | 87 ++++++--------- util/euca_string.c | 87 ++++++--------- util/euca_string.h | 87 ++++++--------- util/euca_system.c | 87 ++++++--------- util/euca_system.h | 87 ++++++--------- util/eucalyptus-config.h.in | 87 ++++++--------- util/fault.c | 87 ++++++--------- util/fault.h | 87 ++++++--------- util/hash.c | 87 ++++++--------- util/hash.h | 87 ++++++--------- util/instance33.h | 87 ++++++--------- util/ipc.c | 87 ++++++--------- util/ipc.h | 87 ++++++--------- util/log.c | 87 ++++++--------- util/log.h | 87 ++++++--------- util/misc.h | 87 ++++++--------- util/sensor.c | 87 ++++++--------- util/sensor.h | 87 ++++++--------- util/sequence_executor.c | 87 ++++++--------- util/sequence_executor.h | 87 ++++++--------- util/stats/fs_emitter.c | 87 ++++++--------- util/stats/fs_emitter.h | 87 ++++++--------- util/stats/message_sensor.c | 87 ++++++--------- util/stats/message_sensor.h | 87 ++++++--------- util/stats/message_stats.c | 87 ++++++--------- util/stats/message_stats.h | 87 ++++++--------- util/stats/sensor_common.c | 87 ++++++--------- util/stats/sensor_common.h | 87 ++++++--------- util/stats/service_sensor.c | 87 ++++++--------- util/stats/service_sensor.h | 87 ++++++--------- util/stats/stats.c | 97 +++++++---------- util/stats/stats.h | 87 ++++++--------- util/template.c | 87 ++++++--------- util/template.h | 87 ++++++--------- util/test.c | 87 ++++++--------- util/utf8.c | 87 ++++++--------- util/utf8.h | 87 ++++++--------- util/wc.c | 87 ++++++--------- util/wc.h | 87 ++++++--------- 1133 files changed, 36631 insertions(+), 62675 deletions(-) diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/BlockDeviceResource.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/BlockDeviceResource.java index 939511139db..c94d919654e 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/BlockDeviceResource.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/BlockDeviceResource.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/FileResource.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/FileResource.java index 7f010e54f56..2dc61134619 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/FileResource.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/FileResource.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/Storage.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/Storage.java index 698d4eaad5b..dae1c3bb291 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/Storage.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/Storage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/StorageResource.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/StorageResource.java index 2646c30681a..e025ad5f098 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/StorageResource.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/StorageResource.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdInputStream.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdInputStream.java index d3f0a9bb85e..1bd54ecb507 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdInputStream.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdInputStream.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdOutputStream.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdOutputStream.java index fd613e58230..8a28b287096 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdOutputStream.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdOutputStream.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdResource.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdResource.java index b4924e6bf66..cbc4f2f3dc9 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdResource.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/CephRbdResource.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdImageToBeDeleted.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdImageToBeDeleted.java index 29f42b0434e..52da673b08b 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdImageToBeDeleted.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdImageToBeDeleted.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdInfo.java index 2ed21a7f53c..d8b7543ac42 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdSnapshotToBeDeleted.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdSnapshotToBeDeleted.java index e64d6f275a9..21522ec25d6 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdSnapshotToBeDeleted.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/entities/CephRbdSnapshotToBeDeleted.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/CannotDeleteCephImageException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/CannotDeleteCephImageException.java index b2a91284e77..ed809635ab4 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/CannotDeleteCephImageException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/CannotDeleteCephImageException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/CephImageNotFoundException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/CephImageNotFoundException.java index f29eaf0ba40..31e90e7ed66 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/CephImageNotFoundException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/CephImageNotFoundException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/EucalyptusCephException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/EucalyptusCephException.java index 82d2542a704..7a665f740e6 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/EucalyptusCephException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/ceph/exceptions/EucalyptusCephException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.ceph.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/BlockStorageGlobalConfiguration.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/BlockStorageGlobalConfiguration.java index e6529dc21aa..941692be3ab 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/BlockStorageGlobalConfiguration.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/BlockStorageGlobalConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/CHAPUserInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/CHAPUserInfo.java index f3e337d4fde..ebbf98b704c 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/CHAPUserInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/CHAPUserInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/DASInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/DASInfo.java index e1947265d6d..b882ba39151 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/DASInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/DASInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ /* diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/DirectStorageInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/DirectStorageInfo.java index 6e0b72431d8..02d3ceec4b3 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/DirectStorageInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/DirectStorageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/ISCSIMetaInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/ISCSIMetaInfo.java index 7ebd26189b9..3ede9ec33eb 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/ISCSIMetaInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/ISCSIMetaInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/ISCSIVolumeInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/ISCSIVolumeInfo.java index f2d116ccc29..799f2c21237 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/ISCSIVolumeInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/ISCSIVolumeInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/LVMMetaInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/LVMMetaInfo.java index 79761b520e0..4adc048d73b 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/LVMMetaInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/LVMMetaInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/LVMVolumeInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/LVMVolumeInfo.java index a801639d9cb..b8fde305dfe 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/LVMVolumeInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/LVMVolumeInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotInfo.java index 7b9c096e34b..3c9f541cdaf 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotPart.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotPart.java index 0320416b537..f08155c1c68 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotPart.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotPart.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotTransferConfiguration.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotTransferConfiguration.java index f29918db961..1d4f2fb1824 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotTransferConfiguration.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotTransferConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotUploadInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotUploadInfo.java index 4db50265c85..78248f64d55 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotUploadInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/SnapshotUploadInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/StorageInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/StorageInfo.java index 28fa9504943..df5c180f800 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/StorageInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/StorageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeExportRecord.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeExportRecord.java index a8c22f94e5d..51dc981dc46 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeExportRecord.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeExportRecord.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeInfo.java index 3cf8a6380c5..a427a37c5ae 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeToken.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeToken.java index dc547507b55..fe8fd733855 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeToken.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/entities/VolumeToken.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.entities; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/AccessDeniedException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/AccessDeniedException.java index f2e5afcda74..8a9c1501e1f 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/AccessDeniedException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/AccessDeniedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/ConnectionInfoNotFoundException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/ConnectionInfoNotFoundException.java index bbd3f264f87..01318a08a65 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/ConnectionInfoNotFoundException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/ConnectionInfoNotFoundException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/NoSuchRecordException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/NoSuchRecordException.java index 27b12459c2b..1e53333a371 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/NoSuchRecordException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/NoSuchRecordException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotFinalizeMpuException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotFinalizeMpuException.java index 707aec79661..2b8f5b80e56 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotFinalizeMpuException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotFinalizeMpuException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotInitializeMpuException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotInitializeMpuException.java index c9fd6157b67..e8a636706c7 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotInitializeMpuException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotInitializeMpuException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotNotFoundException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotNotFoundException.java index f8c45a64f62..127e245125e 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotNotFoundException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotNotFoundException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotTooLargeException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotTooLargeException.java index debd099ed27..cd138950dd9 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotTooLargeException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotTooLargeException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotTransferException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotTransferException.java index 0837f2e2151..6efeac57ac4 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotTransferException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotTransferException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotUploadObjectException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotUploadObjectException.java index f4f29666fc6..364670a2178 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotUploadObjectException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotUploadObjectException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotUploadPartException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotUploadPartException.java index e6a6e9f7f67..400062ecc50 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotUploadPartException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/SnapshotUploadPartException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/ThreadPoolNotInitializedException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/ThreadPoolNotInitializedException.java index b97f50705a5..0d7242059cb 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/ThreadPoolNotInitializedException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/ThreadPoolNotInitializedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/UnknownSizeException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/UnknownSizeException.java index 6561b1f5009..71bf2344b8f 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/UnknownSizeException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/UnknownSizeException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/VolumeNotFoundException.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/VolumeNotFoundException.java index 7a9adb59011..c2df7b85bfe 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/VolumeNotFoundException.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/exceptions/VolumeNotFoundException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.exceptions; diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/msgs/StorageConfigurationMessages.groovy b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/msgs/StorageConfigurationMessages.groovy index 85de2b6d691..f52678c318f 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/msgs/StorageConfigurationMessages.groovy +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/msgs/StorageConfigurationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/msgs/StorageController.groovy b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/msgs/StorageController.groovy index f7e52c678c8..4e57f6ec046 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/msgs/StorageController.groovy +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/msgs/StorageController.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/SANProperties.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/SANProperties.java index 7e40cfc99e7..fb16664a8ef 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/SANProperties.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/SANProperties.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Sunil Soman sunils@cs.ucsb.edu diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/entities/SANInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/entities/SANInfo.java index 2f7c05474ad..d878941db58 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/entities/SANInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/entities/SANInfo.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * Author: chris grzegorczyk */ diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/entities/SANVolumeInfo.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/entities/SANVolumeInfo.java index 26fb286b206..072437998dd 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/entities/SANVolumeInfo.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/san/common/entities/SANVolumeInfo.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * Author: Neil Soman neil@eucalyptus.com */ diff --git a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/upgrade/SANVolumeInfo400Upgrade.java b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/upgrade/SANVolumeInfo400Upgrade.java index 222f65e3dc3..e98cd96db77 100644 --- a/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/upgrade/SANVolumeInfo400Upgrade.java +++ b/clc/modules/block-storage-common/src/main/java/com/eucalyptus/blockstorage/upgrade/SANVolumeInfo400Upgrade.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.upgrade; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/BlockStorageEventListener.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/BlockStorageEventListener.java index 0910d0c7c01..4b6462fa543 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/BlockStorageEventListener.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/BlockStorageEventListener.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/BlockStorageManagerFactory.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/BlockStorageManagerFactory.java index 97f8355c7a2..81c29277d3c 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/BlockStorageManagerFactory.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/BlockStorageManagerFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/FileInputStreamWithCallback.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/FileInputStreamWithCallback.java index bc70cf49fce..b1c86a47dfb 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/FileInputStreamWithCallback.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/FileInputStreamWithCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpReader.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpReader.java index 155d690a6eb..3444b72de8b 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpReader.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpReader.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpTransfer.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpTransfer.java index be1ca7ae57f..6660d086db2 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpTransfer.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpTransfer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpWriter.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpWriter.java index fcbf69e909c..2b65616e6a0 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpWriter.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/HttpWriter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/LVMWrapper.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/LVMWrapper.java index 05d88fa7921..f8b4a94d005 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/LVMWrapper.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/LVMWrapper.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Zach Hill zach@eucalyptus.com diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/LogicalStorageManager.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/LogicalStorageManager.java index 3445d5a1f49..71e397bf3dc 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/LogicalStorageManager.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/LogicalStorageManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/OverlayManager.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/OverlayManager.java index 412bb1617d7..ebf641cdfbd 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/OverlayManager.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/OverlayManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/PutMethodWithProgress.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/PutMethodWithProgress.java index d8e153b9375..5e48ad09f33 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/PutMethodWithProgress.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/PutMethodWithProgress.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/S3SnapshotTransfer.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/S3SnapshotTransfer.java index 1e5553e6f6d..057ba555e91 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/S3SnapshotTransfer.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/S3SnapshotTransfer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/SnapshotProgressCallback.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/SnapshotProgressCallback.java index ea5065a2df6..ccf060d3bf6 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/SnapshotProgressCallback.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/SnapshotProgressCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/SnapshotTransfer.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/SnapshotTransfer.java index 452bcae1afd..9c71cbfb160 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/SnapshotTransfer.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/SnapshotTransfer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/StorageExportManager.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/StorageExportManager.java index d4e1102951d..542a9dc1afc 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/StorageExportManager.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/StorageExportManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/StorageManagers.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/StorageManagers.java index 8cc1c744c65..588a7f66a63 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/StorageManagers.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/StorageManagers.java @@ -1,65 +1,41 @@ -/******************************************************************************* - * Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************* - * @author chris grzegorczyk - */ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/VolumeTokenService.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/VolumeTokenService.java index 3b1cdbc9848..afd03db8d71 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/VolumeTokenService.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/VolumeTokenService.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/SnapshotTransferCleaner.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/SnapshotTransferCleaner.java index 5035ac925ef..7e77254cb2b 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/SnapshotTransferCleaner.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/SnapshotTransferCleaner.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.async; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumeDeleter.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumeDeleter.java index ab8f5c66d4f..0af85f2342e 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumeDeleter.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumeDeleter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.async; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumeStateChecker.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumeStateChecker.java index d46ead2bbce..0a1b05e3e15 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumeStateChecker.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumeStateChecker.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.async; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumesConvertor.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumesConvertor.java index 8838cdf0166..0c9b0516d8e 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumesConvertor.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/async/VolumesConvertor.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.async; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/bootstrap/BlockStorageBootstrapper.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/bootstrap/BlockStorageBootstrapper.java index 266a6d64c9a..af419ede5cc 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/bootstrap/BlockStorageBootstrapper.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/bootstrap/BlockStorageBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.bootstrap; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/config/StorageControllerBuilder.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/config/StorageControllerBuilder.java index 3f8fb0e6d45..abc255b4308 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/config/StorageControllerBuilder.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/config/StorageControllerBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.config; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/config/StorageControllerConfiguration.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/config/StorageControllerConfiguration.java index 98168cb93d0..199f609983b 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/config/StorageControllerConfiguration.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/config/StorageControllerConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.config; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/pipelines/ExternalStorageControllerSoapPipeline.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/pipelines/ExternalStorageControllerSoapPipeline.java index c053a1a1a04..1c97acb0180 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/pipelines/ExternalStorageControllerSoapPipeline.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/pipelines/ExternalStorageControllerSoapPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.pipelines; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/AbstractSANTask.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/AbstractSANTask.java index c1495564141..7fefbf95f42 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/AbstractSANTask.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/AbstractSANTask.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Neil Soman neil@eucalyptus.com diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/Paths.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/Paths.java index 7e818765ea3..64d63142a0c 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/Paths.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/Paths.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Neil Soman neil@eucalyptus.com diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANManager.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANManager.java index 1b97a521a52..e0733ea0050 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANManager.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANManager.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Neil Soman neil@eucalyptus.com diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANProvider.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANProvider.java index 2b60836d43c..9539206ba57 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANProvider.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANProvider.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Neil Soman neil@eucalyptus.com diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANTask.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANTask.java index 9cd6b79003d..c7ed2166c04 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANTask.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SANTask.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Neil Soman neil@eucalyptus.com diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SessionManager.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SessionManager.java index dbe81f7735a..480823614cd 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SessionManager.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/SessionManager.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Neil Soman neil@eucalyptus.com diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/ShellSessionManager.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/ShellSessionManager.java index bb8aec6a52f..83c44b8a2a9 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/ShellSessionManager.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/san/common/ShellSessionManager.java @@ -1,63 +1,41 @@ -/******************************************************************************* - *Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - *******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ /* * * Author: Neil Soman neil@eucalyptus.com diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/CheckerThreadPool.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/CheckerThreadPool.java index 60bd0c13b95..0a5eae5bac3 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/CheckerThreadPool.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/CheckerThreadPool.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.threadpool; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/SnapshotThreadPool.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/SnapshotThreadPool.java index 5d1ec7828bb..21eb53646ef 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/SnapshotThreadPool.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/SnapshotThreadPool.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.threadpool; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/SnapshotTransferThreadPool.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/SnapshotTransferThreadPool.java index a2d353ccbfb..ee63957c110 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/SnapshotTransferThreadPool.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/SnapshotTransferThreadPool.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.threadpool; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/VolumeThreadPool.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/VolumeThreadPool.java index 46e47ffa2ab..f6e314b285b 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/VolumeThreadPool.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/threadpool/VolumeThreadPool.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.threadpool; diff --git a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/upgrade/VolumeExportRecord411Upgrade.java b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/upgrade/VolumeExportRecord411Upgrade.java index dfaa54fb059..f1479fb1552 100644 --- a/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/upgrade/VolumeExportRecord411Upgrade.java +++ b/clc/modules/block-storage/src/main/java/com/eucalyptus/blockstorage/upgrade/VolumeExportRecord411Upgrade.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.upgrade; diff --git a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/CreateSnapshotTest.java b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/CreateSnapshotTest.java index 767c73d35aa..7030fb7bd41 100644 --- a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/CreateSnapshotTest.java +++ b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/CreateSnapshotTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/CreateVolumeFromSnapshotTest.java b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/CreateVolumeFromSnapshotTest.java index 9b0bd38684f..94f32a832f8 100644 --- a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/CreateVolumeFromSnapshotTest.java +++ b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/CreateVolumeFromSnapshotTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/DeleteSnapshotTest.java b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/DeleteSnapshotTest.java index 557076b74ed..da41d202576 100644 --- a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/DeleteSnapshotTest.java +++ b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/DeleteSnapshotTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/StorageTests.java b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/StorageTests.java index 886ca49b4a6..a1d84d45c52 100644 --- a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/StorageTests.java +++ b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/StorageTests.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/VolumeTest.java b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/VolumeTest.java index 77d6ba3559a..ca730a7e377 100644 --- a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/VolumeTest.java +++ b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/VolumeTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/san/common/SANManagerTest.java b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/san/common/SANManagerTest.java index 72b76e82978..b53baef5c46 100644 --- a/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/san/common/SANManagerTest.java +++ b/clc/modules/block-storage/src/test/java/com/eucalyptus/blockstorage/san/common/SANManagerTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage.san.common; diff --git a/clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.h b/clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.h index 21ab01cc0cf..69a1bcc0f96 100644 --- a/clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.h +++ b/clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.h @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef __EUCALYPTUS_BOOTSTRAP_H__ diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java index 9f161a3c731..d87ba4b5513 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.address; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AddressManager.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AddressManager.java index 38ccf3fad47..1c09e4ccf38 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AddressManager.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AddressManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.address; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Addresses.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Addresses.java index b8d61b113bb..f21686580a6 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Addresses.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Addresses.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.address; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotManager.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotManager.java index cac90c652c9..64ab838114f 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotManager.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotUpdateEventListener.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotUpdateEventListener.java index 62da3a017c4..a65fc9fe5d8 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotUpdateEventListener.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotUpdateEventListener.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeManager.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeManager.java index 71c1848b312..018d76a4122 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeManager.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeUpdateEventListener.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeUpdateEventListener.java index 2053f861fc9..6df658ea0b3 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeUpdateEventListener.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/VolumeUpdateEventListener.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volumes.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volumes.java index 0c5fc09c536..ae199209322 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volumes.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volumes.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.blockstorage; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/EucalyptusBuilder.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/EucalyptusBuilder.java index 6d4edfe1fb7..1e9c0486022 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/EucalyptusBuilder.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/EucalyptusBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/EucalyptusConfiguration.groovy b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/EucalyptusConfiguration.groovy index ccaa715442c..90e564b428c 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/EucalyptusConfiguration.groovy +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/EucalyptusConfiguration.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/ResourceToken.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/ResourceToken.java index 692e9164bc5..37e507f2745 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/ResourceToken.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/ResourceToken.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/VmRunType.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/VmRunType.java index f12e679a30c..ace6e0beb0a 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/VmRunType.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/VmRunType.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/AdmissionControl.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/AdmissionControl.java index 1344a68dee2..ad186f3d7f3 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/AdmissionControl.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/AdmissionControl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.run; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/Allocations.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/Allocations.java index d10e8ab7017..6d557cc6256 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/Allocations.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/Allocations.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.run; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java index 6b7c8103185..453987ea535 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.run; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ContractEnforcement.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ContractEnforcement.java index 5884b1963af..27dbb6f9f00 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ContractEnforcement.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ContractEnforcement.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.run; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/VerificationException.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/VerificationException.java index 6ceff222a3e..3b8717f8bc7 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/VerificationException.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/VerificationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.run; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/VerifyMetadata.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/VerifyMetadata.java index 3cd40f2aa27..08d2959b134 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/VerifyMetadata.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/VerifyMetadata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.run; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java index 42977289906..e8b127e9c06 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBuilder.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBuilder.java index 8514c13f3bf..b4e08458680 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBuilder.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterClientPipelineFactory.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterClientPipelineFactory.java index de0e69ded9e..e689e55a162 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterClientPipelineFactory.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterClientPipelineFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterConfiguration.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterConfiguration.java index b8d738a4c51..a7458c89fbd 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterConfiguration.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterEndpoint.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterEndpoint.java index 4a0ccbd11ee..7742a51fd3b 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterEndpoint.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterEndpoint.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Clusters.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Clusters.java index 93b273e2564..5f83b5eee2f 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Clusters.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Clusters.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/GatherLogClientPipeline.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/GatherLogClientPipeline.java index 3178dcdc613..38bf1f40fd3 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/GatherLogClientPipeline.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/GatherLogClientPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/NetworkAlreadyExistsException.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/NetworkAlreadyExistsException.java index 26170988af4..cbdd5569dea 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/NetworkAlreadyExistsException.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/NetworkAlreadyExistsException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ResourceState.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ResourceState.java index e333b527455..44baa932aba 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ResourceState.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ResourceState.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ClusterCertsCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ClusterCertsCallback.java index ecae816ba33..ff34b1e31cf 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ClusterCertsCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ClusterCertsCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ClusterLogMessageCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ClusterLogMessageCallback.java index 72861af73b8..c4fe8c9bbce 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ClusterLogMessageCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ClusterLogMessageCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/LogDataCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/LogDataCallback.java index c7853586ba6..55115dc0307 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/LogDataCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/LogDataCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/RebootCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/RebootCallback.java index 9e8df912d94..6b3646e0ea4 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/RebootCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/RebootCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ResourceStateCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ResourceStateCallback.java index 09e09d06ef3..b043404245d 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ResourceStateCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/ResourceStateCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StartServiceCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StartServiceCallback.java index 0c39a2f5364..303d7597af1 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StartServiceCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StartServiceCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java index e0cef4db328..586131eb5b9 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateMessageCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateMessageCallback.java index f0e82e03a54..d4ac35bff31 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateMessageCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateMessageCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/TerminateCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/TerminateCallback.java index 1c19128ffa7..a841afebcf0 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/TerminateCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/TerminateCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmRunCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmRunCallback.java index 8cd4b1f1aaa..4f5666983b1 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmRunCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmRunCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmStateCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmStateCallback.java index c3dcb201775..7122938cb28 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmStateCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmStateCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeAttachCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeAttachCallback.java index 48cb3b55d1a..1779746f459 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeAttachCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeAttachCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeDetachCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeDetachCallback.java index 84f3ce33f03..0e9927737d7 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeDetachCallback.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VolumeDetachCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.callback; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/event/ClusterEvents.groovy b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/event/ClusterEvents.groovy index e8401c519cc..880efdcf6f3 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/event/ClusterEvents.groovy +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/event/ClusterEvents.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cluster.event; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/ComputeDefaultHandler.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/ComputeDefaultHandler.java index df2334fad95..b5cd2bfb4df 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/ComputeDefaultHandler.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/ComputeDefaultHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/conversion/ExportManager.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/conversion/ExportManager.java index 31dcbf4b946..a6a064223f9 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/conversion/ExportManager.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/conversion/ExportManager.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/conversion/ImageManifestException.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/conversion/ImageManifestException.java index 8608499233e..64fe48662df 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/conversion/ImageManifestException.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/conversion/ImageManifestException.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.compute.conversion; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/entities/ComputeMetadata.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/entities/ComputeMetadata.java index de1d9927695..842606687c5 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/entities/ComputeMetadata.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/entities/ComputeMetadata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.entities; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/InstanceDataDnsResolver.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/InstanceDataDnsResolver.java index c344b997f8f..6339cf2ac5f 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/InstanceDataDnsResolver.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/InstanceDataDnsResolver.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.compute.metadata; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/MetadataPipeline.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/MetadataPipeline.java index c81dd37a31d..7484fa88867 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/MetadataPipeline.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/MetadataPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.metadata; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/VmMetadata.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/VmMetadata.java index dc04bb9c83e..c1b93b975e8 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/VmMetadata.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/metadata/VmMetadata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.metadata; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/AddressNumberQuotaKey.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/AddressNumberQuotaKey.java index 0cc05ab5bd5..d5df321f1fc 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/AddressNumberQuotaKey.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/AddressNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/ExpirationTime.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/ExpirationTime.java index b630a27a7d0..950a84adccf 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/ExpirationTime.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/ExpirationTime.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/ImageNumberQuotaKey.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/ImageNumberQuotaKey.java index c4031371a0f..720154423fa 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/ImageNumberQuotaKey.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/ImageNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/KeepAlive.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/KeepAlive.java index db19c2f9291..d1bc51eb429 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/KeepAlive.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/KeepAlive.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/SnapshotNumberQuotaKey.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/SnapshotNumberQuotaKey.java index 11b706bc744..17c1464a413 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/SnapshotNumberQuotaKey.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/SnapshotNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VmInstanceActiveNumberQuotaKey.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VmInstanceActiveNumberQuotaKey.java index 0f2a9bc602f..13281240a0c 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VmInstanceActiveNumberQuotaKey.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VmInstanceActiveNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VmInstanceNumberQuotaKey.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VmInstanceNumberQuotaKey.java index bfa536e903c..5aa3f68a608 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VmInstanceNumberQuotaKey.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VmInstanceNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VolumeNumberQuotaKey.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VolumeNumberQuotaKey.java index 17e95189519..4b7c303dd41 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VolumeNumberQuotaKey.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VolumeNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VolumeTotalSizeQuotaKey.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VolumeTotalSizeQuotaKey.java index a246282ea44..0117962badb 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VolumeTotalSizeQuotaKey.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/compute/policy/VolumeTotalSizeQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.policy; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/Emis.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/Emis.java index 4a11522fd80..75513b1a6c1 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/Emis.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/Emis.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.images; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageConfiguration.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageConfiguration.java index 655b6d27b30..4910697610a 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageConfiguration.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.images; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManager.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManager.java index 7f8be7a0d61..c648a7ba147 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManager.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.images; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManifests.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManifests.java index ed0a6e7c32f..1a4e312e6f6 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManifests.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManifests.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/Images.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/Images.java index b6bc7b5ccf0..ba03ed472b3 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/Images.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/Images.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.images; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/keys/KeyPairManager.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/keys/KeyPairManager.java index b2d28320a4e..69798be02ae 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/keys/KeyPairManager.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/keys/KeyPairManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.keys; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkGroupManager.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkGroupManager.java index c4f2d780db9..42b3f0c03d8 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkGroupManager.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkGroupManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.network; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkGroups.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkGroups.java index fc1fbd4dfea..0f05c8fddad 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkGroups.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkGroups.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.network; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkIndexRange.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkIndexRange.java index f1fab323622..f7f30d79136 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkIndexRange.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/NetworkIndexRange.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.network; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeController.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeController.java index 89681297a12..929eae15373 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeController.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeController.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.node; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfiguration.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfiguration.java index 8c4cf8f4289..03a668651c6 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfiguration.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.node; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfigurationBuilder.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfigurationBuilder.java index 33009b40060..e92329e7f32 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfigurationBuilder.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfigurationBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.node; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfigurationMessages.groovy b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfigurationMessages.groovy index 06e304ed3fd..dd7e9b5f521 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfigurationMessages.groovy +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/NodeControllerConfigurationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/Nodes.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/Nodes.java index 707fed9dc8a..d28e0bd909e 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/Nodes.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/node/Nodes.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/util/async/StatefulMessageSet.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/util/async/StatefulMessageSet.java index 97bc504eada..ce91bd38cb9 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/util/async/StatefulMessageSet.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/util/async/StatefulMessageSet.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/Bundles.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/Bundles.java index 757bcf455b9..3c9af3d3d3f 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/Bundles.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/Bundles.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.vm; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/MetadataRequest.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/MetadataRequest.java index bf994cddbe1..dd5ba713f0b 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/MetadataRequest.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/MetadataRequest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.vm; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/MigrationTags.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/MigrationTags.java index 2a8ebf20a2c..567dddc3c53 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/MigrationTags.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/MigrationTags.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.vm; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java index 521c5f58fcd..1a9ceb738d8 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.vm; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstanceMetadata.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstanceMetadata.java index 5829cccd060..cccfe4daab6 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstanceMetadata.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstanceMetadata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.vm; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java index f65393fca83..e0dba2e60ea 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.vm; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/InstanceDomainNames.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/InstanceDomainNames.java index 46d70f17380..81cc182d566 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/InstanceDomainNames.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/InstanceDomainNames.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.vm.dns; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/RecursiveDnsResolver.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/RecursiveDnsResolver.java index 9be2d8c5c7e..40a3c1b652b 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/RecursiveDnsResolver.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/RecursiveDnsResolver.java @@ -1,41 +1,18 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/SplitHorizonResolver.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/SplitHorizonResolver.java index fd82f446367..e855601f398 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/SplitHorizonResolver.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/dns/SplitHorizonResolver.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes.java index 9beb447a1ae..7fbc87621b8 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.vmtypes; diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes330Upgrade.groovy b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes330Upgrade.groovy index f48abd9e6c6..9b202504812 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes330Upgrade.groovy +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes330Upgrade.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.vmtypes diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypesManager.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypesManager.java index 56c86bb7ccd..5c8bb0fa146 100644 --- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypesManager.java +++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypesManager.java @@ -1,66 +1,41 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************* - * @author chris grzegorczyk - */ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ package com.eucalyptus.vmtypes; import javax.annotation.Nullable; diff --git a/clc/modules/component/src/main/java/com/eucalyptus/cloud/ws/ComponentService.java b/clc/modules/component/src/main/java/com/eucalyptus/cloud/ws/ComponentService.java index c887d9b0221..f5a847d455d 100644 --- a/clc/modules/component/src/main/java/com/eucalyptus/cloud/ws/ComponentService.java +++ b/clc/modules/component/src/main/java/com/eucalyptus/cloud/ws/ComponentService.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.ws; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/CloudMetadata.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/CloudMetadata.java index 124826a7a09..d170e10b546 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/CloudMetadata.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/CloudMetadata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/CloudMetadatas.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/CloudMetadatas.java index 770a52674ca..21061c87892 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/CloudMetadatas.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/CloudMetadatas.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/ImageMetadata.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/ImageMetadata.java index 75d6e63b400..a17e2de5aa5 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/ImageMetadata.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/ImageMetadata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/StaticDiskImage.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/StaticDiskImage.java index dbb2fc77ee0..d70206f18f4 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/StaticDiskImage.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/StaticDiskImage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/config/EucalyptusConfigurationMessages.groovy b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/config/EucalyptusConfigurationMessages.groovy index 895860eed9d..dfceaeaf17a 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/config/EucalyptusConfigurationMessages.groovy +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/config/EucalyptusConfigurationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Snapshot.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Snapshot.java index ce2536b523d..57f775834ec 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Snapshot.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Snapshot.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.blockstorage; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Snapshots.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Snapshots.java index a73dfba831f..27df4018af8 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Snapshots.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Snapshots.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.blockstorage; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/State.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/State.java index e6231f27bdb..774a6820221 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/State.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/State.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.blockstorage; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Volume.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Volume.java index 6192cbb0b4e..7d72ffb548f 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Volume.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/blockstorage/Volume.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.blockstorage; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BlockStorageDeviceMapping.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BlockStorageDeviceMapping.java index f875dd70a71..a6c8de35c76 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BlockStorageDeviceMapping.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BlockStorageDeviceMapping.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BlockStorageImageInfo.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BlockStorageImageInfo.java index 49d20922ab1..63de41a15b1 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BlockStorageImageInfo.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BlockStorageImageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BootableImageInfo.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BootableImageInfo.java index c71520f8a2b..bb6986e76c9 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BootableImageInfo.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/BootableImageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/DeviceMapping.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/DeviceMapping.java index a765d9a8ba8..ba31e3e9dfd 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/DeviceMapping.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/DeviceMapping.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/EphemeralDeviceMapping.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/EphemeralDeviceMapping.java index 09237a9947d..6b5da0f8a34 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/EphemeralDeviceMapping.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/EphemeralDeviceMapping.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/ImageInfo.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/ImageInfo.java index 3017bb82289..a1e8fdf07c9 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/ImageInfo.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/ImageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/Images.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/Images.java index f4e17d28c7f..3cfe5b47a75 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/Images.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/Images.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/KernelImageInfo.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/KernelImageInfo.java index dae29557d5c..a9abf736a70 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/KernelImageInfo.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/KernelImageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/MachineImageInfo.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/MachineImageInfo.java index 83f5c7ba0a5..9d11ee5b9f9 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/MachineImageInfo.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/MachineImageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/PendingRegistrationImageInfo.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/PendingRegistrationImageInfo.java index d72532035ee..5fe56a99d2f 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/PendingRegistrationImageInfo.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/PendingRegistrationImageInfo.java @@ -1,66 +1,41 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/PutGetImageInfo.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/PutGetImageInfo.java index e2b29887183..8583853dfc6 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/PutGetImageInfo.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/PutGetImageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/RamdiskImageInfo.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/RamdiskImageInfo.java index 2c98d21a1fd..6d7c8de6130 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/RamdiskImageInfo.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/RamdiskImageInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/SuppressDeviceMappping.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/SuppressDeviceMappping.java index bfbcc82582a..99de6614f81 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/SuppressDeviceMappping.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/images/SuppressDeviceMappping.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.images; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/keys/KeyPairs.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/keys/KeyPairs.java index d0b5bc62fd4..a9ae85eecf7 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/keys/KeyPairs.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/keys/KeyPairs.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.keys; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/keys/SshKeyPair.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/keys/SshKeyPair.java index ab34cfb1e0d..94605ffcd05 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/keys/SshKeyPair.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/keys/SshKeyPair.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.keys; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkGroup.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkGroup.java index b9afacffe00..5a81e93e9f1 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkGroup.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkGroup.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.network; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkGroups.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkGroups.java index 47155c33e24..69ea0c14407 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkGroups.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkGroups.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.network; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkPeer.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkPeer.java index d1bd0ca0739..3efe23c0533 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkPeer.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkPeer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.network; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkRule.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkRule.java index c455bd77322..96660df9741 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkRule.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/network/NetworkRule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.network; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/DuplicateMetadataException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/DuplicateMetadataException.java index a37e553a1a1..d6d56c08a10 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/DuplicateMetadataException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/DuplicateMetadataException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/IllegalMetadataAccessException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/IllegalMetadataAccessException.java index 3f3304e1661..cdeebc500ed 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/IllegalMetadataAccessException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/IllegalMetadataAccessException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/InvalidMetadataException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/InvalidMetadataException.java index afdbf91bcae..eaf1d53b48f 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/InvalidMetadataException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/InvalidMetadataException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/MetadataCreationException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/MetadataCreationException.java index aae93f4f5cb..f04c7535462 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/MetadataCreationException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/MetadataCreationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/MetadataException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/MetadataException.java index 82063562d0d..96a0752430c 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/MetadataException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/MetadataException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NoSuchImageIdException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NoSuchImageIdException.java index d6bad6f712d..f31235329d3 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NoSuchImageIdException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NoSuchImageIdException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NoSuchMetadataException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NoSuchMetadataException.java index 9cbdf02eeea..dfe4d4378b7 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NoSuchMetadataException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NoSuchMetadataException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NotEnoughResourcesException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NotEnoughResourcesException.java index 2f98cc3c376..5ea94295c65 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NotEnoughResourcesException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/NotEnoughResourcesException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/PersistentReference.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/PersistentReference.java index 20f80010c17..dfc344003a5 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/PersistentReference.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/PersistentReference.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/Reference.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/Reference.java index 71f2eaa3dc1..2d2cb37db74 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/Reference.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/Reference.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/ResourceAllocationException.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/ResourceAllocationException.java index 2459ede318d..2b63630c235 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/ResourceAllocationException.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/util/ResourceAllocationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.util; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/MigrationState.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/MigrationState.java index 8ec47206d47..f91dd72f3f2 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/MigrationState.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/MigrationState.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmBootRecord.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmBootRecord.java index ef0444d074d..ed89b28f30c 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmBootRecord.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmBootRecord.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmBundleTask.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmBundleTask.java index 0c83c9fb8d2..fdd37a078e6 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmBundleTask.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmBundleTask.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmCreateImageTask.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmCreateImageTask.java index 8c84dd14926..c4177e0864a 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmCreateImageTask.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmCreateImageTask.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmEphemeralAttachment.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmEphemeralAttachment.java index 60952df11f4..0100b4a1d1a 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmEphemeralAttachment.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmEphemeralAttachment.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmId.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmId.java index 51d945ec2be..30817b91d03 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmId.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmId.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmInstance.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmInstance.java index ea34ab43e7f..deb56766bf1 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmInstance.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmInstance.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmInstances.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmInstances.java index d6949bf2d7a..fad90c0ab7f 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmInstances.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmInstances.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmLaunchRecord.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmLaunchRecord.java index 66d1924ca91..e6e1ae74093 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmLaunchRecord.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmLaunchRecord.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmMigrationTask.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmMigrationTask.java index 1395c2c8516..577c91188b6 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmMigrationTask.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmMigrationTask.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmNetworkConfig.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmNetworkConfig.java index 9cbe8cc36e7..81c0fe9482b 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmNetworkConfig.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmNetworkConfig.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmPlacement.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmPlacement.java index 088a245289a..967bc7ac97d 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmPlacement.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmPlacement.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmRuntimeState.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmRuntimeState.java index 99e103279ec..7295d9cee45 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmRuntimeState.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmRuntimeState.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmUsageStats.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmUsageStats.java index 5d4f690ce56..60043b3a01d 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmUsageStats.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmUsageStats.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmVolumeAttachment.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmVolumeAttachment.java index 01c03524b69..80f9bb2a348 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmVolumeAttachment.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmVolumeAttachment.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmVolumeState.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmVolumeState.java index b35d65c53cc..7036a29471e 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmVolumeState.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vm/VmVolumeState.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vm; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vmtypes/EphemeralDisk.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vmtypes/EphemeralDisk.java index 53c68dbe0bd..79d56cea3fb 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vmtypes/EphemeralDisk.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vmtypes/EphemeralDisk.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vmtypes; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vmtypes/VmType.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vmtypes/VmType.java index 02b77fa87b8..bd6d221e92f 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vmtypes/VmType.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/internal/vmtypes/VmType.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.internal.vmtypes; diff --git a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/policy/Ec2ResourceName.java b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/policy/Ec2ResourceName.java index 265843917bb..0826f36419e 100644 --- a/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/policy/Ec2ResourceName.java +++ b/clc/modules/compute-common/src/main/java/com/eucalyptus/compute/common/policy/Ec2ResourceName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.compute.common.policy; diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBootstrapper.java b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBootstrapper.java index d20cce6147b..b0afff748b4 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBootstrapper.java +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config; diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBuilder.java b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBuilder.java index bda76ef91e6..724906196ae 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBuilder.java +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config; diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorConfigurationMessages.groovy b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorConfigurationMessages.groovy index 9189f202d5d..b3a651413c8 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorConfigurationMessages.groovy +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorConfigurationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorControl.java b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorControl.java index 34724aa901c..8b718a5b217 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorControl.java +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorControl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config; diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ClusterConfigurationMessages.groovy b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ClusterConfigurationMessages.groovy index 0ebdaf98c47..4f2ed870097 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ClusterConfigurationMessages.groovy +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ClusterConfigurationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationManager.java b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationManager.java index deb75556137..0a63a524bf0 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationManager.java +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config; diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationMessages.groovy b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationMessages.groovy index 0c0a548c209..2fd981cc039 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationMessages.groovy +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/PropertiesManager.java b/clc/modules/configuration/src/main/java/com/eucalyptus/config/PropertiesManager.java index 254fe50cb6e..b5e450740c6 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/PropertiesManager.java +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/PropertiesManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config; diff --git a/clc/modules/configuration/src/main/java/com/eucalyptus/config/PropertiesMessages.groovy b/clc/modules/configuration/src/main/java/com/eucalyptus/config/PropertiesMessages.groovy index d90a25fc596..43eb07bd6d8 100644 --- a/clc/modules/configuration/src/main/java/com/eucalyptus/config/PropertiesMessages.groovy +++ b/clc/modules/configuration/src/main/java/com/eucalyptus/config/PropertiesMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/core/src/main/java/com/eucalyptus/event/SystemConfigurationEvent.java b/clc/modules/core/src/main/java/com/eucalyptus/event/SystemConfigurationEvent.java index d4e293f3b1f..a442fb09adf 100644 --- a/clc/modules/core/src/main/java/com/eucalyptus/event/SystemConfigurationEvent.java +++ b/clc/modules/core/src/main/java/com/eucalyptus/event/SystemConfigurationEvent.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/core/src/main/java/com/eucalyptus/upgrade/DatabaseDestination.java b/clc/modules/core/src/main/java/com/eucalyptus/upgrade/DatabaseDestination.java index d3b457b1882..88c0875fc06 100644 --- a/clc/modules/core/src/main/java/com/eucalyptus/upgrade/DatabaseDestination.java +++ b/clc/modules/core/src/main/java/com/eucalyptus/upgrade/DatabaseDestination.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.upgrade; diff --git a/clc/modules/core/src/main/java/com/eucalyptus/upgrade/PostgresqlDestination.java b/clc/modules/core/src/main/java/com/eucalyptus/upgrade/PostgresqlDestination.java index ab586fc1d97..93aff72abdb 100644 --- a/clc/modules/core/src/main/java/com/eucalyptus/upgrade/PostgresqlDestination.java +++ b/clc/modules/core/src/main/java/com/eucalyptus/upgrade/PostgresqlDestination.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.upgrade; diff --git a/clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java b/clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java index b6eb60b229c..41b92c18f74 100644 --- a/clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java +++ b/clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.upgrade; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchSnapshotException.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchSnapshotException.java index 52d71a8281e..d4faacc7854 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchSnapshotException.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchSnapshotException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.cloud; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchVolumeException.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchVolumeException.java index 677ffe71a55..d5aac99602b 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchVolumeException.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchVolumeException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.cloud; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/SnapshotInUseException.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/SnapshotInUseException.java index b067d824fa3..a2a3ae83cc7 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/SnapshotInUseException.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/SnapshotInUseException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.cloud; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeAlreadyExistsException.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeAlreadyExistsException.java index 344e6f3b7a9..3a97bb31925 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeAlreadyExistsException.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeAlreadyExistsException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.cloud; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeInUseException.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeInUseException.java index 6f85184d636..089b110f4e8 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeInUseException.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeInUseException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.cloud; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeNotReadyException.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeNotReadyException.java index 3f76c735a26..e63a86ee3ec 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeNotReadyException.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeNotReadyException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.cloud; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeSizeExceededException.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeSizeExceededException.java index 090d6cdf399..2ec95c6119b 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeSizeExceededException.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/VolumeSizeExceededException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.cloud; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ConfigParser.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ConfigParser.java index c031fdbbef7..e0188563a4e 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ConfigParser.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ConfigParser.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.util; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphore.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphore.java index bcbe7214cb7..6f72a070270 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphore.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphore.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.util; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphoreDirectory.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphoreDirectory.java index 871ebcef9ca..ed7d6cd1ff5 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphoreDirectory.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/EucaSemaphoreDirectory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.util; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ReplyCoordinator.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ReplyCoordinator.java index f3879a2f282..f0c557779b5 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ReplyCoordinator.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/ReplyCoordinator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.util; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/StreamConsumer.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/StreamConsumer.java index 155b2e891c2..5dc76c0a7e5 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/StreamConsumer.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/StreamConsumer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.util; diff --git a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/SystemUtil.java b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/SystemUtil.java index 9f51f0b1594..16bc810055c 100644 --- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/SystemUtil.java +++ b/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/SystemUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.util; diff --git a/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestDescription.java b/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestDescription.java index 93aede5fd90..faf8f0a0ad1 100644 --- a/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestDescription.java +++ b/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestDescription.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.upgrade; diff --git a/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestHarness.java b/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestHarness.java index 1bce792514f..20f6342a591 100644 --- a/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestHarness.java +++ b/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestHarness.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.upgrade; diff --git a/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestListener.java b/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestListener.java index c0c4300ee92..24c07bad985 100644 --- a/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestListener.java +++ b/clc/modules/core/src/test/java/com/eucalyptus/upgrade/TestListener.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.upgrade; diff --git a/clc/modules/dns/src/main/java/com/eucalyptus/bootstrap/DNSBootstrapper.java b/clc/modules/dns/src/main/java/com/eucalyptus/bootstrap/DNSBootstrapper.java index f159d1325df..e77a0e1ebc4 100644 --- a/clc/modules/dns/src/main/java/com/eucalyptus/bootstrap/DNSBootstrapper.java +++ b/clc/modules/dns/src/main/java/com/eucalyptus/bootstrap/DNSBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java b/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java index abf515ec5f5..885812ca655 100644 --- a/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java +++ b/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.ws; diff --git a/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPHandler.java b/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPHandler.java index a4bda9a82e9..778b7a45cde 100644 --- a/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPHandler.java +++ b/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.ws; diff --git a/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPListener.java b/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPListener.java index 61e5a352ac6..a67eee6524d 100644 --- a/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPListener.java +++ b/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/TCPListener.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.cloud.ws; diff --git a/clc/modules/euare-common/src/main/java/com/eucalyptus/auth/euare/EuareMessages.groovy b/clc/modules/euare-common/src/main/java/com/eucalyptus/auth/euare/EuareMessages.groovy index f76167b66a9..1202b45b688 100644 --- a/clc/modules/euare-common/src/main/java/com/eucalyptus/auth/euare/EuareMessages.groovy +++ b/clc/modules/euare-common/src/main/java/com/eucalyptus/auth/euare/EuareMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/AuthenticationProperties.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/AuthenticationProperties.java index b3ffed39f95..7dc41388c4b 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/AuthenticationProperties.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/AuthenticationProperties.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/AccountProvider.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/AccountProvider.java index f06bfb3e029..0298115019c 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/AccountProvider.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/AccountProvider.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/Accounts.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/Accounts.java index aee67704425..4a134c1325d 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/Accounts.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/Accounts.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareException.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareException.java index 03c5c9dbb82..77f455d8614 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareException.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareQuotaUtil.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareQuotaUtil.java index c45c24a4834..08391aead38 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareQuotaUtil.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareQuotaUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareService.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareService.java index 02ced3e35b3..676412d605e 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareService.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/EuareService.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/GroupNumberQuotaKey.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/GroupNumberQuotaKey.java index 70bbc3ecb8f..5de1628b75d 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/GroupNumberQuotaKey.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/GroupNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/Privileged.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/Privileged.java index a9495c495c2..77ccf95fadb 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/Privileged.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/Privileged.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/UserNumberQuotaKey.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/UserNumberQuotaKey.java index a36ad39b67d..2cb55328195 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/UserNumberQuotaKey.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/UserNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/InvalidValueException.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/InvalidValueException.java index e02fe8b6281..c36d59267c9 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/InvalidValueException.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/InvalidValueException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.checker; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/ValueChecker.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/ValueChecker.java index e3030cfddfb..5128e028680 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/ValueChecker.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/ValueChecker.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.checker; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/ValueCheckerFactory.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/ValueCheckerFactory.java index 74f524aabe4..c3fb191b249 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/ValueCheckerFactory.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/checker/ValueCheckerFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.checker; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapClient.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapClient.java index 90b9d5aa341..1f9746d8f6b 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapClient.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapClient.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapIntegrationConfiguration.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapIntegrationConfiguration.java index 6d773b132bd..c069cfa1821 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapIntegrationConfiguration.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapIntegrationConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapSync.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapSync.java index 870fa05ec57..e569d5c3d80 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapSync.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LdapSync.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LicParser.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LicParser.java index 9cc12d908e3..2b6b5f1b3dd 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LicParser.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LicParser.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LicSpec.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LicSpec.java index fb0e2926fdb..05f27a7d2ea 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LicSpec.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/LicSpec.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/Selection.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/Selection.java index 8a21f877c7e..b6d86b9ad37 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/Selection.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/Selection.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/AuthenticationUtil.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/AuthenticationUtil.java index 24a914950b7..e188370441d 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/AuthenticationUtil.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/AuthenticationUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap.authentication; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/DefaultAuthenticator.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/DefaultAuthenticator.java index cd816c3cd09..c3d9ba5bf8d 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/DefaultAuthenticator.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/DefaultAuthenticator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap.authentication; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/EasySSLSocketFactory.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/EasySSLSocketFactory.java index a6e96eab1dd..a8186050b9b 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/EasySSLSocketFactory.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/EasySSLSocketFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap.authentication; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/GssapiKrb5Authenticator.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/GssapiKrb5Authenticator.java index 5e688bffe80..7ed28861afc 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/GssapiKrb5Authenticator.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/GssapiKrb5Authenticator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap.authentication; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/LdapAuthenticator.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/LdapAuthenticator.java index 2a28857f7d6..91aab68a708 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/LdapAuthenticator.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/LdapAuthenticator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap.authentication; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/LdapAuthenticatorFactory.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/LdapAuthenticatorFactory.java index 8e3e535dabe..a1513a5c8e8 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/LdapAuthenticatorFactory.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/ldap/authentication/LdapAuthenticatorFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap.authentication; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAccessKeyProxy.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAccessKeyProxy.java index 67ab890ee8c..4016204e820 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAccessKeyProxy.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAccessKeyProxy.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAccountProxy.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAccountProxy.java index fa960ece159..c4ce8792ed7 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAccountProxy.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAccountProxy.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthBootstrapper.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthBootstrapper.java index d60c19d5e78..df5143ef8e1 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthBootstrapper.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthProvider.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthProvider.java index e915c5144b6..4dae0b6b755 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthProvider.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthProvider.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthUtils.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthUtils.java index 23a4a032408..c2ae73d22a7 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthUtils.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseAuthUtils.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseCertificateProxy.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseCertificateProxy.java index a27b05d063c..5a0fb0fe369 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseCertificateProxy.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseCertificateProxy.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseGroupProxy.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseGroupProxy.java index afea83d30b5..2aadddbf3a2 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseGroupProxy.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseGroupProxy.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabasePolicyProxy.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabasePolicyProxy.java index 976b1f3140f..e0daae540f3 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabasePolicyProxy.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabasePolicyProxy.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseUserProxy.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseUserProxy.java index 6502ce83cef..bde0551292e 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseUserProxy.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/DatabaseUserProxy.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/AccessKeyEntity.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/AccessKeyEntity.java index 7c0d1ac9bfe..ec0f89a7a63 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/AccessKeyEntity.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/AccessKeyEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist.entities; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/AccountEntity.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/AccountEntity.java index 6428e56af8b..e17639d13fd 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/AccountEntity.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/AccountEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist.entities; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/CertificateEntity.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/CertificateEntity.java index 14c37cf32d3..a18925f687a 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/CertificateEntity.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/CertificateEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist.entities; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/GroupEntity.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/GroupEntity.java index 94c913175ce..27c201286f7 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/GroupEntity.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/GroupEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist.entities; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/OpenIdProviderEntity.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/OpenIdProviderEntity.java index 166efe08563..a8f2e2ad6d9 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/OpenIdProviderEntity.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/OpenIdProviderEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist.entities; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/PolicyEntity.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/PolicyEntity.java index 30410601fd6..1c9a2bbd28f 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/PolicyEntity.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/PolicyEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist.entities; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/UserEntity.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/UserEntity.java index 9f0b6c16e0d..86e5c3af221 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/UserEntity.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/persist/entities/UserEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.persist.entities; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/principal/EuareGroup.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/principal/EuareGroup.java index d78551530b4..206a0a4cc7a 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/principal/EuareGroup.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/principal/EuareGroup.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.principal; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareQueryBinding.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareQueryBinding.java index 9264dfc303a..caf6a2efff7 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareQueryBinding.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareQueryBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.ws; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareQueryPipeline.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareQueryPipeline.java index c99004181d5..a0ca5373559 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareQueryPipeline.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareQueryPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.ws; diff --git a/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareReplyQueue.java b/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareReplyQueue.java index b9c3ed299e0..5c907b97061 100644 --- a/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareReplyQueue.java +++ b/clc/modules/euare/src/main/java/com/eucalyptus/auth/ws/EuareReplyQueue.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.ws; diff --git a/clc/modules/euare/src/test/java/com/eucalyptus/auth/euare/ldap/LdapClientTest.java b/clc/modules/euare/src/test/java/com/eucalyptus/auth/euare/ldap/LdapClientTest.java index d9fb98708a2..a331131dd4d 100644 --- a/clc/modules/euare/src/test/java/com/eucalyptus/auth/euare/ldap/LdapClientTest.java +++ b/clc/modules/euare/src/test/java/com/eucalyptus/auth/euare/ldap/LdapClientTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap; diff --git a/clc/modules/euare/src/test/java/com/eucalyptus/auth/euare/ldap/LicParserTest.java b/clc/modules/euare/src/test/java/com/eucalyptus/auth/euare/ldap/LicParserTest.java index 1e2d5bcc089..c159ed753a2 100644 --- a/clc/modules/euare/src/test/java/com/eucalyptus/auth/euare/ldap/LicParserTest.java +++ b/clc/modules/euare/src/test/java/com/eucalyptus/auth/euare/ldap/LicParserTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.euare.ldap; diff --git a/clc/modules/imaging-backend/src/main/java/com/eucalyptus/compute/conversion/ImportManager.java b/clc/modules/imaging-backend/src/main/java/com/eucalyptus/compute/conversion/ImportManager.java index 575efe4b182..92b11096884 100644 --- a/clc/modules/imaging-backend/src/main/java/com/eucalyptus/compute/conversion/ImportManager.java +++ b/clc/modules/imaging-backend/src/main/java/com/eucalyptus/compute/conversion/ImportManager.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/conf/scripts/initialize_cloud.groovy b/clc/modules/msgs/conf/scripts/initialize_cloud.groovy index 3af166c8914..e89b87fef42 100644 --- a/clc/modules/msgs/conf/scripts/initialize_cloud.groovy +++ b/clc/modules/msgs/conf/scripts/initialize_cloud.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ diff --git a/clc/modules/msgs/conf/scripts/notifications.groovy b/clc/modules/msgs/conf/scripts/notifications.groovy index ccef3d85b97..1f1b3c325f4 100644 --- a/clc/modules/msgs/conf/scripts/notifications.groovy +++ b/clc/modules/msgs/conf/scripts/notifications.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import com.eucalyptus.component.ServiceConfiguration diff --git a/clc/modules/msgs/conf/scripts/notifications_digest.groovy b/clc/modules/msgs/conf/scripts/notifications_digest.groovy index 9b5cfd69e0c..eb00c577ad6 100644 --- a/clc/modules/msgs/conf/scripts/notifications_digest.groovy +++ b/clc/modules/msgs/conf/scripts/notifications_digest.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import com.eucalyptus.component.Components diff --git a/clc/modules/msgs/conf/scripts/setup_dbpool.groovy b/clc/modules/msgs/conf/scripts/setup_dbpool.groovy index 621e8abdf61..f2e4e680871 100644 --- a/clc/modules/msgs/conf/scripts/setup_dbpool.groovy +++ b/clc/modules/msgs/conf/scripts/setup_dbpool.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import com.eucalyptus.bootstrap.BootstrapArgs diff --git a/clc/modules/msgs/conf/scripts/setup_dbpool_remote.groovy b/clc/modules/msgs/conf/scripts/setup_dbpool_remote.groovy index 7e8e2de6992..24500e8b5ab 100644 --- a/clc/modules/msgs/conf/scripts/setup_dbpool_remote.groovy +++ b/clc/modules/msgs/conf/scripts/setup_dbpool_remote.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ diff --git a/clc/modules/msgs/conf/scripts/setup_membership.groovy b/clc/modules/msgs/conf/scripts/setup_membership.groovy index 164192ba1f7..05389d6c130 100644 --- a/clc/modules/msgs/conf/scripts/setup_membership.groovy +++ b/clc/modules/msgs/conf/scripts/setup_membership.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import org.apache.log4j.Logger diff --git a/clc/modules/msgs/conf/scripts/setup_persistence.groovy b/clc/modules/msgs/conf/scripts/setup_persistence.groovy index df08362b6ff..6475625309b 100644 --- a/clc/modules/msgs/conf/scripts/setup_persistence.groovy +++ b/clc/modules/msgs/conf/scripts/setup_persistence.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import com.eucalyptus.component.id.Database diff --git a/clc/modules/msgs/conf/scripts/setup_persistence_remote.groovy b/clc/modules/msgs/conf/scripts/setup_persistence_remote.groovy index c49da4f5399..c44638555a8 100644 --- a/clc/modules/msgs/conf/scripts/setup_persistence_remote.groovy +++ b/clc/modules/msgs/conf/scripts/setup_persistence_remote.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import com.eucalyptus.entities.PersistenceContextConfiguration diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/BaseException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/BaseException.java index fbe4f2313e1..28e838e148c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/BaseException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/BaseException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Accounts.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Accounts.java index 65a2b0c2dca..4e8e9f384c5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Accounts.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Accounts.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/AuthException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/AuthException.java index 30ffe1c83a3..06d19ae020a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/AuthException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/AuthException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Contract.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Contract.java index 15476baa297..4a4e843a6e0 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Contract.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Contract.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Debugging.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Debugging.java index e3541e86e09..4146b8a6599 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Debugging.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Debugging.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/LdapException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/LdapException.java index 00cea64eddd..80d37abef04 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/LdapException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/LdapException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/LicParseException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/LicParseException.java index f6c34dfa46f..50f58f6d857 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/LicParseException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/LicParseException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Permissions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Permissions.java index 404345a1ac6..861ecf72a71 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Permissions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/Permissions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/PolicyParseException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/PolicyParseException.java index 20c4566d099..4d1e4890550 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/PolicyParseException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/PolicyParseException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseLoginModule.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseLoginModule.java index 8adf955a4cd..d1f12cde624 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseLoginModule.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseLoginModule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.api; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseSecurityException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseSecurityException.java index 5441ebdcb6d..83b96e53e08 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseSecurityException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/BaseSecurityException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.api; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/NoSuchCertificateException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/NoSuchCertificateException.java index f3c3086aa21..b487b6bd645 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/NoSuchCertificateException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/NoSuchCertificateException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.api; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/PolicyEngine.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/PolicyEngine.java index d81d94be397..ff017f5e369 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/PolicyEngine.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/api/PolicyEngine.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.api; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/json/JsonUtils.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/json/JsonUtils.java index 313515a7388..a95824ebbb1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/json/JsonUtils.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/json/JsonUtils.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.json; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/AuthenticationException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/AuthenticationException.java index bb10eb9aebc..5ef9eb183ff 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/AuthenticationException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/AuthenticationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacCredentials.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacCredentials.java index 6ee7916c88b..b2aad0c3d19 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacCredentials.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacCredentials.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacLoginModuleSupport.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacLoginModuleSupport.java index a0a7dc21d16..b40d8492d66 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacLoginModuleSupport.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/HmacLoginModuleSupport.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/Hmacv2LoginModule.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/Hmacv2LoginModule.java index 6f0f6390551..e1e7ab53da5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/Hmacv2LoginModule.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/Hmacv2LoginModule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/SecurityContext.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/SecurityContext.java index 92a02a5fd86..567c2f105ff 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/SecurityContext.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/SecurityContext.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WrappedCredentials.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WrappedCredentials.java index 8c09c300e89..44724c24c92 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WrappedCredentials.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WrappedCredentials.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecCredentials.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecCredentials.java index ceb56a7b1ea..327e477e13d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecCredentials.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecCredentials.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecLoginModule.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecLoginModule.java index e9a95b7c1a2..9572dc5e277 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecLoginModule.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/login/WsSecLoginModule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/CachedKeyEvaluator.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/CachedKeyEvaluator.java index 47fcc808f90..93d1aaa03d5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/CachedKeyEvaluator.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/CachedKeyEvaluator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyAnnotationRegistry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyAnnotationRegistry.java index 6b519fa4cdd..f007e64c5ec 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyAnnotationRegistry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyAnnotationRegistry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyEngineImpl.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyEngineImpl.java index 23ad3f38fcf..756ff8405a7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyEngineImpl.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyEngineImpl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyParser.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyParser.java index 21f3e4bc032..53fc6a87a17 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyParser.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyParser.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicySpec.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicySpec.java index 6632432a997..9ee9f689419 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicySpec.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicySpec.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyUtils.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyUtils.java index 952744241d2..d43a0b43f7e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyUtils.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicyUtils.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/annotation/PolicyAction.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/annotation/PolicyAction.java index add7d316de0..f9330b59d42 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/annotation/PolicyAction.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/annotation/PolicyAction.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.annotation; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/annotation/PolicyResourceType.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/annotation/PolicyResourceType.java index 368a3ec26a1..1676539793f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/annotation/PolicyResourceType.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/annotation/PolicyResourceType.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.annotation; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/AddressConditionOp.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/AddressConditionOp.java index 248969de513..b4bf051b15a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/AddressConditionOp.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/AddressConditionOp.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/Bool.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/Bool.java index c09e837d6e1..085a74d3307 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/Bool.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/Bool.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/ConditionOp.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/ConditionOp.java index e26c058e6d1..ac3f8d36f70 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/ConditionOp.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/ConditionOp.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/ConditionOpDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/ConditionOpDiscovery.java index 6c3db7cc17d..c703abe7eb3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/ConditionOpDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/ConditionOpDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/Conditions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/Conditions.java index a1337fe87d4..80707a7b66f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/Conditions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/Conditions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateConditionOp.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateConditionOp.java index ccb780277fc..560885ed868 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateConditionOp.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateConditionOp.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateEquals.java index eb1e0505c2e..eb581dabcce 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateGreaterThan.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateGreaterThan.java index 3bfc1e793ae..b9c5f92bc02 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateGreaterThan.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateGreaterThan.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateGreaterThanEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateGreaterThanEquals.java index e5a646e44e4..dbd9268aa26 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateGreaterThanEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateGreaterThanEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateLessThan.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateLessThan.java index ba2f88cb775..f9a20e8e07c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateLessThan.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateLessThan.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateLessThanEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateLessThanEquals.java index 014e648c3e5..7353323b89f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateLessThanEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateLessThanEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateNotEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateNotEquals.java index d3080d0fdd9..612f8f5b072 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateNotEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/DateNotEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/IpAddress.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/IpAddress.java index 2babb030b84..355fc877e44 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/IpAddress.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/IpAddress.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NotIpAddress.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NotIpAddress.java index 3f4bf8b17bc..fd2e3c723e1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NotIpAddress.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NotIpAddress.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericConditionOp.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericConditionOp.java index c707e48438f..e7874c9a33e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericConditionOp.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericConditionOp.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericEquals.java index c20097a66e5..265a3ec8337 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericGreaterThan.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericGreaterThan.java index 15c8a98e1a7..a567e861405 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericGreaterThan.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericGreaterThan.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericGreaterThanEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericGreaterThanEquals.java index 03fdf6cb37f..a0e0aafb4fd 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericGreaterThanEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericGreaterThanEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericLessThan.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericLessThan.java index 737f56b054a..8b48e1c6ba1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericLessThan.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericLessThan.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericLessThanEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericLessThanEquals.java index 13e4e147d86..b5a7e895e2b 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericLessThanEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericLessThanEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericNotEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericNotEquals.java index 949c7fec0dc..fde48088e0b 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericNotEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/NumericNotEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/PolicyCondition.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/PolicyCondition.java index 0401bc48982..d09ea493819 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/PolicyCondition.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/PolicyCondition.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringConditionOp.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringConditionOp.java index f3b15a4f889..cae527b8df1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringConditionOp.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringConditionOp.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringEquals.java index 1775dbfe113..5f6ba9e2d11 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringEqualsIgnoreCase.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringEqualsIgnoreCase.java index 6ab39ec9bdf..e0c272e8570 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringEqualsIgnoreCase.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringEqualsIgnoreCase.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringLike.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringLike.java index f2636b39b40..e2d910a882c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringLike.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringLike.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotEquals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotEquals.java index 6c4ff7ad74b..bb367c82bfb 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotEquals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotEquals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotEqualsIgnoreCase.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotEqualsIgnoreCase.java index bbc94039865..f3de1cb717d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotEqualsIgnoreCase.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotEqualsIgnoreCase.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotLike.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotLike.java index 22a2a1b4c4e..90aac53f516 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotLike.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/condition/StringNotLike.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.condition; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/AddressUtil.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/AddressUtil.java index 963dcc3c481..6eccb60173d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/AddressUtil.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/AddressUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.ern; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/Ern.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/Ern.java index 1d7762c9fa6..9bdbc1ccea3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/Ern.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/Ern.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.ern; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/EuareResourceName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/EuareResourceName.java index 7d82696e464..b1f2b582031 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/EuareResourceName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/EuareResourceName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.ern; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/WildcardResourceName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/WildcardResourceName.java index 687b6fa6135..e3a8561f922 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/WildcardResourceName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/ern/WildcardResourceName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.ern; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Cidr.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Cidr.java index 456018e6893..44c92e65677 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Cidr.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Cidr.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/CidrParseException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/CidrParseException.java index 6ad89c7d3ae..8c26440e7be 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/CidrParseException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/CidrParseException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/ContractKey.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/ContractKey.java index c0a4e986180..ecf61c84032 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/ContractKey.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/ContractKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/ContractKeyEvaluator.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/ContractKeyEvaluator.java index 3c3e3dd2d9c..debc1c72560 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/ContractKeyEvaluator.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/ContractKeyEvaluator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/CurrentTime.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/CurrentTime.java index 085aaf01473..1a945c0e2ec 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/CurrentTime.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/CurrentTime.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Iso8601DateParser.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Iso8601DateParser.java index df20e4683ab..69a71a91761 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Iso8601DateParser.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Iso8601DateParser.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Key.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Key.java index f261d57c6b7..56c21a3de14 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Key.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Key.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/KeyDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/KeyDiscovery.java index 08656c659a8..a85897153fe 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/KeyDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/KeyDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/KeyUtils.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/KeyUtils.java index 0edc5612701..4d381f51562 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/KeyUtils.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/KeyUtils.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Keys.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Keys.java index a9abfe3330a..94f88409db8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Keys.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/Keys.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/PolicyKey.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/PolicyKey.java index fa36ba5a7ab..113de1cdcec 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/PolicyKey.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/PolicyKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/QuotaKey.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/QuotaKey.java index 286141c3576..310575c6b20 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/QuotaKey.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/QuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/SourceIp.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/SourceIp.java index cca56c160ca..8b70460e46e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/SourceIp.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/key/SourceIp.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy.key; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AccessKey.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AccessKey.java index 1fde253e5e6..473664c103f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AccessKey.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AccessKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AccountFullName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AccountFullName.java index a9870c42200..56914b47dfa 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AccountFullName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/AccountFullName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Authorization.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Authorization.java index 3b54bd2a4cf..01f9170392d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Authorization.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Authorization.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/BasePrincipal.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/BasePrincipal.java index 74ccf43d085..fcd8c3b9aea 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/BasePrincipal.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/BasePrincipal.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Certificate.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Certificate.java index 870bb99b682..ee00264150f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Certificate.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Certificate.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Condition.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Condition.java index b479af72bad..d4f1726681a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Condition.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Condition.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/FullName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/FullName.java index 515bbffb4b8..413dc453a94 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/FullName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/FullName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/OpenIdConnectProvider.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/OpenIdConnectProvider.java index cab5d597f29..9705d3343f1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/OpenIdConnectProvider.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/OpenIdConnectProvider.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/OwnerFullName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/OwnerFullName.java index 3262927dfc0..dc444cbf970 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/OwnerFullName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/OwnerFullName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Policy.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Policy.java index b71d78806f9..f7d4339a189 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Policy.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Policy.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Principals.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Principals.java index 7ce11710f06..ccdedf839c8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Principals.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/Principals.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/User.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/User.java index 9ffb67ff6b6..a2f15099080 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/User.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/User.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/UserFullName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/UserFullName.java index bd2b3016c78..2a5dfc96e4c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/UserFullName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/principal/UserFullName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.principal; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/type/RestrictedType.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/type/RestrictedType.java index 12d310121a3..8da14dd0f58 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/type/RestrictedType.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/type/RestrictedType.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.type; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/Hashes.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/Hashes.java index 4ab3fb23a9e..6ba813c1f92 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/Hashes.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/Hashes.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/X509CertHelper.java b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/X509CertHelper.java index b3e8c5e4bed..17a24c5f295 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/X509CertHelper.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/auth/util/X509CertHelper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/Binding.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/Binding.java index 35943af36d8..889b2c0a68b 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/Binding.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/Binding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.binding; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingCache.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingCache.java index 1ec1daafd78..58649a236ae 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingCache.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingCache.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.binding; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingDiscovery.java index 014619262c6..6d2c0182349 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.binding; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingException.java index f251920c780..a6fe65246c7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.binding; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingManager.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingManager.java index c9698f3e295..e610ee36091 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingManager.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.binding; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpEmbedded.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpEmbedded.java index 812fb57246f..4407613dc5a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpEmbedded.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpEmbedded.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.binding; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpParameterMapping.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpParameterMapping.java index a194075ef57..ddd92c5a976 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpParameterMapping.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HttpParameterMapping.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.binding; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ArgumentValidationError.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ArgumentValidationError.java index b8fcedb783e..1d4d4ea7e5d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ArgumentValidationError.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ArgumentValidationError.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java index 668ddef99ff..8fc263e85d2 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrap.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrap.java index 88d282a2ffb..c1ed7aad06d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrap.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrap.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapArgs.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapArgs.java index fae757e8fef..a084d218b8e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapArgs.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapArgs.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapError.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapError.java index b425efce567..fea1ff5040f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapError.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapError.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapException.java index 1f45293dcdb..97019bc9906 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrapper.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrapper.java index 906f3f55021..293eee822e3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrapper.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Bootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapperDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapperDiscovery.java index 14d68535bb4..5c087fbc046 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapperDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BootstrapperDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/CanBootstrap.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/CanBootstrap.java index 5fbf8660795..15cddc2577e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/CanBootstrap.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/CanBootstrap.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/CloudControllerColocatingBootstrapper.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/CloudControllerColocatingBootstrapper.java index 0ed404282de..f770b369c23 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/CloudControllerColocatingBootstrapper.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/CloudControllerColocatingBootstrapper.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DatabaseBootstrapper.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DatabaseBootstrapper.java index 00eef7a74f9..40a660da426 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DatabaseBootstrapper.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DatabaseBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Databases.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Databases.java index 124b85662e7..c065acdea69 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Databases.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Databases.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsLocal.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsLocal.java index 550aef005bb..55bd82223b1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsLocal.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsLocal.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsRemote.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsRemote.java index 99dd332ccb9..d0665a91bc7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsRemote.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/DependsRemote.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Handles.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Handles.java index 5e313e57684..f895b4b9faa 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Handles.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Handles.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Host.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Host.java index f66f7ab07b9..c339bcbfd1e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Host.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Host.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Hosts.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Hosts.java index 6621612300b..8794025b532 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Hosts.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Hosts.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/NeedsDeferredInitialization.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/NeedsDeferredInitialization.java index c2d62b30355..34ac15ea01d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/NeedsDeferredInitialization.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/NeedsDeferredInitialization.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/OrderedShutdown.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/OrderedShutdown.java index c2f251b6526..40db4b9a1ce 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/OrderedShutdown.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/OrderedShutdown.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Provides.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Provides.java index 46d513905e2..c919706b2aa 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Provides.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Provides.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/RunDuring.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/RunDuring.java index 80befc76bd5..9ea9de33a3a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/RunDuring.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/RunDuring.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java index dbb5f0e5974..562912987a2 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ShutdownHook.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ShutdownHook.java index efbddfce4c3..a144e2cce1d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ShutdownHook.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ShutdownHook.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java index b705a855b4d..05411ebd230 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemIds.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemIds.java index 6dac38420ac..3fbd225147f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemIds.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemIds.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/AbstractServiceBuilder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/AbstractServiceBuilder.java index ee7ddfa468f..0366977f1e8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/AbstractServiceBuilder.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/AbstractServiceBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/BasicService.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/BasicService.java index e0544122c3a..f17e9b23633 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/BasicService.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/BasicService.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java index 26ba2425c3d..d59b446b0e9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentDiscovery.java index 7811a71be8d..69e82f2f18e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentFullName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentFullName.java index a71f0f54e3f..06f4d8fb686 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentFullName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentFullName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java index f7d6ed626ab..7d7445ea463 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentIds.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentIds.java index 335b200776f..672f787d8b3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentIds.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentIds.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentMessages.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentMessages.java index c37f1a3898f..68499fd501c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentMessages.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentMessages.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java index d229e459c72..7d409f2f4c3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentTransitions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentTransitions.java index 7e8a674dba6..1d324becc4c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentTransitions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentTransitions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Components.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Components.java index 8714c151ae7..758ea7b8f00 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Components.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Components.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Dispatcher.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Dispatcher.java index 33faa37ab3f..a6631b89ed5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Dispatcher.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Dispatcher.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/DummyServiceBuilder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/DummyServiceBuilder.java index 701278d39f9..5dea932b890 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/DummyServiceBuilder.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/DummyServiceBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/EphemeralConfiguration.groovy b/clc/modules/msgs/src/main/java/com/eucalyptus/component/EphemeralConfiguration.groovy index 96e675c2333..4ce75e4e5b9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/EphemeralConfiguration.groovy +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/EphemeralConfiguration.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Faults.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Faults.java index 55affdbbffd..b81a20c6bdf 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Faults.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Faults.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchComponentException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchComponentException.java index c002fcb455d..008e51240d9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchComponentException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchComponentException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchServiceException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchServiceException.java index ee15ea07b8f..ad64b71602d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchServiceException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/NoSuchServiceException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Partition.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Partition.java index b6567027900..c82b1aaf004 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Partition.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Partition.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Partitions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Partitions.java index 6e32c223cfe..8ba44add8ee 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Partitions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Partitions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/RegionSpoofingResolver.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/RegionSpoofingResolver.java index b716a07c8a4..2cf111f2ef8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/RegionSpoofingResolver.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/RegionSpoofingResolver.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Service.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Service.java index 6597b9ff039..a31bd44bc6c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Service.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Service.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilder.java index 49a60e722dd..ba442e7a22a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilder.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilders.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilders.java index a3a8c6a6961..f89a1580a2c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilders.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceBuilders.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfiguration.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfiguration.java index 974b53943a3..746bb4a6a65 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfiguration.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfigurations.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfigurations.java index d52360e4b20..ecab729f6dd 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfigurations.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceConfigurations.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceOperations.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceOperations.java index 6d6d3510fd0..8988a48a269 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceOperations.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceOperations.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceOrderings.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceOrderings.java index 414c6a928a1..d4071b956e7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceOrderings.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceOrderings.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceRegistrationException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceRegistrationException.java index 660b2a995cd..35f4162d690 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceRegistrationException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceRegistrationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceState.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceState.java index eec5c32fea6..a04414aab1f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceState.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceState.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceTransitions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceTransitions.java index ec574cca46e..8a06a7469f5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceTransitions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceTransitions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceUris.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceUris.java index 62826026ce0..284aaf51c83 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceUris.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceUris.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Topology.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Topology.java index 56ed2473942..dc40b09a6c3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Topology.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Topology.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/TopologyDnsResolver.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/TopologyDnsResolver.java index 530cacd7e44..94d4de05174 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/TopologyDnsResolver.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/TopologyDnsResolver.java @@ -1,41 +1,18 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/annotation/AwsServiceName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/annotation/AwsServiceName.java index d8d00a3b44c..f5a8a05eacf 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/annotation/AwsServiceName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/annotation/AwsServiceName.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.component.annotation; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/annotation/Description.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/annotation/Description.java index 546505042e8..ef01de04890 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/annotation/Description.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/annotation/Description.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/auth/SystemCredentials.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/auth/SystemCredentials.java index 4a614f69889..0d9e475a8b6 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/auth/SystemCredentials.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/auth/SystemCredentials.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.auth; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/events/ServiceEvents.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/events/ServiceEvents.java index ae96f6945ed..446a8b3ff03 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/events/ServiceEvents.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/events/ServiceEvents.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/Common.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/Common.java index 1430a2d0b2b..43627e71b70 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/Common.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/Common.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/EffectiveValue.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/EffectiveValue.java index 3ea289c4c06..3faac1f12b5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/EffectiveValue.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/EffectiveValue.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/Fault.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/Fault.java index 72f5c24af97..dab07faa462 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/Fault.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/Fault.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultBuilderImpl.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultBuilderImpl.java index 06757feceab..8442a363e54 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultBuilderImpl.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultBuilderImpl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultField.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultField.java index a63051dd699..10f790c9a2c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultField.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultField.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultFieldName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultFieldName.java index 607a4299c4c..e7377e55514 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultFieldName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultFieldName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; public enum FaultFieldName { diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultLogger.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultLogger.java index e69418d4d16..7d90bda4288 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultLogger.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultLogger.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultMessage.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultMessage.java index d4efa5d50a3..9221174d3a8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultMessage.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultMessage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultRegistry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultRegistry.java index f04b335f049..23d74da4283 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultRegistry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultRegistry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultSubsystemManager.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultSubsystemManager.java index c152b6b8363..26f0a3a2076 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultSubsystemManager.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/fault/FaultSubsystemManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.fault; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ApiEndpointServicesGroup.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ApiEndpointServicesGroup.java index a92352831ec..f031c2dfee3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ApiEndpointServicesGroup.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ApiEndpointServicesGroup.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/BaseServiceGroupBuilder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/BaseServiceGroupBuilder.java index 2199cf4a2c6..38d3cef8861 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/BaseServiceGroupBuilder.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/BaseServiceGroupBuilder.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/BaseServiceGroupConfiguration.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/BaseServiceGroupConfiguration.java index 65530bb03ba..5cf849fb4c2 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/BaseServiceGroupConfiguration.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/BaseServiceGroupConfiguration.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroup.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroup.java index 4e2f2ae2caa..3e28bb164eb 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroup.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroup.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroupBuilder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroupBuilder.java index 41ddf5ff922..82163104d3b 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroupBuilder.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroupBuilder.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroupConfiguration.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroupConfiguration.java index e3272deb4dd..a758efcaeaf 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroupConfiguration.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroupConfiguration.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroups.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroups.java index ee3e326d107..d3e347d020f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroups.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/groups/ServiceGroups.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ClusterController.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ClusterController.java index 51c53aef50b..dd248a150b1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ClusterController.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ClusterController.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.id; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ComponentService.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ComponentService.java index 8591f8b2a3d..ac5ba4f97b2 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ComponentService.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/ComponentService.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.id; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Database.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Database.java index 156a0317621..88077cf7dd4 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Database.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Database.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.id; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Dns.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Dns.java index 05c3d18d273..14ef7a742d1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Dns.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Dns.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.id; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Euare.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Euare.java index 20debf41582..e01d55d5ef7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Euare.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Euare.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.id; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Eucalyptus.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Eucalyptus.java index dc9431aa2e8..9f6bb752781 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Eucalyptus.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Eucalyptus.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.id; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Ldap.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Ldap.java index 3218d5e613b..182d07f71f9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Ldap.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Ldap.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.id; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Reporting.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Reporting.java index 18562742b2b..d9955df9170 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Reporting.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Reporting.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.component.id; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/config/ArbitratorConfiguration.groovy b/clc/modules/msgs/src/main/java/com/eucalyptus/config/ArbitratorConfiguration.groovy index f6b0c71495f..a883e398991 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/config/ArbitratorConfiguration.groovy +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/config/ArbitratorConfiguration.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/config/BaseSystemConfiguration.groovy b/clc/modules/msgs/src/main/java/com/eucalyptus/config/BaseSystemConfiguration.groovy index 16717668795..ac1e222f57d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/config/BaseSystemConfiguration.groovy +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/config/BaseSystemConfiguration.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/config/ComponentConfiguration.java b/clc/modules/msgs/src/main/java/com/eucalyptus/config/ComponentConfiguration.java index 078fbbb17d1..270c1ce77bc 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/config/ComponentConfiguration.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/config/ComponentConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/config/ConfigurationService.java b/clc/modules/msgs/src/main/java/com/eucalyptus/config/ConfigurationService.java index 702f866c041..13ad7292984 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/config/ConfigurationService.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/config/ConfigurationService.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.config; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/AbstractConfigurableProperty.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/AbstractConfigurableProperty.java index f416df7fc21..a47d7dd6130 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/AbstractConfigurableProperty.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/AbstractConfigurableProperty.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Configurable.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Configurable.java index a138b1ab885..452af9c5c90 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Configurable.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Configurable.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableClass.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableClass.java index 8d98c3393b2..6791ea99baa 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableClass.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableClass.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableField.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableField.java index 9744f672b47..f60f704fbf3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableField.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableField.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableFieldType.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableFieldType.java index 98ba5053530..da678561831 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableFieldType.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableFieldType.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableIdentifier.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableIdentifier.java index b96bcea418a..19ef119e89b 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableIdentifier.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableIdentifier.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableProperty.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableProperty.java index b2a4e4ff0ca..ebab9bfacf5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableProperty.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurableProperty.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyBuilder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyBuilder.java index b517b51fe50..1a496c0b5d5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyBuilder.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyException.java index 8acd76f2dfe..283c346140d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurablePropertyException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Configurables.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Configurables.java index 7ae41216325..3b30413070e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Configurables.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Configurables.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/MultiDatabasePropertyEntry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/MultiDatabasePropertyEntry.java index 295e2fcab24..e71291a2f74 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/MultiDatabasePropertyEntry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/MultiDatabasePropertyEntry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Properties.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Properties.java index dfa44c9adc5..76be910a7c9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Properties.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/Properties.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java index e38f58e338d..df15b2698de 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyChangeListener.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyChangeListener.java index 64783ac4fed..5b4d3b7e844 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyChangeListener.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyChangeListener.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyChangeListeners.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyChangeListeners.java index babba49e092..04f629715c7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyChangeListeners.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyChangeListeners.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyDirectory.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyDirectory.java index 3a714eefb24..859eade521e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyDirectory.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyDirectory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyTypeParser.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyTypeParser.java index 3fcb5241058..fa7d8804241 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyTypeParser.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyTypeParser.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/SingletonDatabasePropertyEntry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/SingletonDatabasePropertyEntry.java index 2d484d3e10f..9ca9f10b4b5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/SingletonDatabasePropertyEntry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/SingletonDatabasePropertyEntry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticDatabasePropertyEntry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticDatabasePropertyEntry.java index 20946c42120..484466494f4 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticDatabasePropertyEntry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticDatabasePropertyEntry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticPropertyEntry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticPropertyEntry.java index cebf5d12e48..e84e74ce7ee 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticPropertyEntry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/StaticPropertyEntry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.configurable; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/Context.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/Context.java index 167d8619c43..e6a3116b09f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/Context.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/Context.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/Contexts.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/Contexts.java index bf8ad856e55..be0ef8e316f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/Contexts.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/Contexts.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/IllegalContextAccessException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/IllegalContextAccessException.java index ddd648f2ae7..752758931d7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/IllegalContextAccessException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/IllegalContextAccessException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/NoSuchContextException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/NoSuchContextException.java index c2d1e813fd0..16cf810046c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/NoSuchContextException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/NoSuchContextException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContext.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContext.java index 1aa8675d2b3..084b3b7431f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContext.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContext.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextConfigurationException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextConfigurationException.java index 23474e660dc..e8b1c5826b7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextConfigurationException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextConfigurationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextErrorFilter.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextErrorFilter.java index 026182402d4..6ee7014a71d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextErrorFilter.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextErrorFilter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextManager.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextManager.java index db62cf85c63..441e6275f53 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextManager.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContextManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceDispatchException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceDispatchException.java index eb8cf05fa83..f3821aa0148 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceDispatchException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceDispatchException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceInitializationException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceInitializationException.java index 7824dd34674..0d8f9d4f80c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceInitializationException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceInitializationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceStateException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceStateException.java index 9b0155ce877..bdc1e87a094 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceStateException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceStateException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.context; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/BaseSecurityProvider.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/BaseSecurityProvider.java index e9967fcff69..1bdb58bf425 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/BaseSecurityProvider.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/BaseSecurityProvider.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CertificateProvider.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CertificateProvider.java index dc199347aa6..0ce46bf3f1a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CertificateProvider.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CertificateProvider.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Certs.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Certs.java index 285ebb4aa7b..2a6134c2be2 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Certs.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Certs.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Crypto.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Crypto.java index 178514cb0cf..0e85a4b5bc0 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Crypto.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Crypto.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CryptoProvider.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CryptoProvider.java index ec42cafee00..2697c0b6495 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CryptoProvider.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/CryptoProvider.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/DefaultCryptoProvider.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/DefaultCryptoProvider.java index 84e2f7c7618..0454a3d0e5d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/DefaultCryptoProvider.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/DefaultCryptoProvider.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Digest.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Digest.java index 3f0bdc6816b..ad2613394c3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Digest.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Digest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Hmac.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Hmac.java index 82b335acd27..5cfea702be7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Hmac.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Hmac.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/HmacProvider.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/HmacProvider.java index 6d042c05263..109ad1c2edf 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/HmacProvider.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/HmacProvider.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Hmacs.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Hmacs.java index 3f2afc9e624..712a68bdb6d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Hmacs.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Hmacs.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/KeyStore.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/KeyStore.java index d3a13d7ab58..53deddcb306 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/KeyStore.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/KeyStore.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Signatures.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Signatures.java index 0fe73255c98..e76a50a7c98 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Signatures.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/Signatures.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/StringCrypto.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/StringCrypto.java index 7c42928517e..daafd701613 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/StringCrypto.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/StringCrypto.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/AbstractKeyStore.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/AbstractKeyStore.java index df946c401d9..7fb9809037a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/AbstractKeyStore.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/AbstractKeyStore.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/B64.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/B64.java index fe365668cde..31477644c2a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/B64.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/B64.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/Base64Handler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/Base64Handler.java index dee5f53a910..d18b2654ccb 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/Base64Handler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/Base64Handler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/PEMFiles.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/PEMFiles.java index 7e1409d2cd6..00d22aacd59 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/PEMFiles.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/PEMFiles.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SSLSocketFactoryWrapper.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SSLSocketFactoryWrapper.java index a3f02d1496d..ca127c423ea 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SSLSocketFactoryWrapper.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SSLSocketFactoryWrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SecurityParameter.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SecurityParameter.java index 0c02f5fa992..615ab5c5e96 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SecurityParameter.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SecurityParameter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SimpleClientX509TrustManager.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SimpleClientX509TrustManager.java index c19ab76088b..e3753137d87 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SimpleClientX509TrustManager.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SimpleClientX509TrustManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslSetup.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslSetup.java index 62298bcd9d9..6f5c21810dd 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslSetup.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslSetup.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/Timestamps.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/Timestamps.java index 1fbb62f2e9d..5df84168fb6 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/Timestamps.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/Timestamps.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java index 83272b8e7ac..3ef495839db 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/Empyrean.java b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/Empyrean.java index 4d981df91b6..a834ed5e2f3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/Empyrean.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/Empyrean.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.empyrean; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanMessages.groovy b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanMessages.groovy index 9dbcf40844c..6ea3405d6a3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanMessages.groovy +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanService.java b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanService.java index ef82888875d..98552b96b98 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanService.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanService.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.empyrean; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/configuration/ServiceRegistrationManager.java b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/configuration/ServiceRegistrationManager.java index a47b93ebdc6..2e458b10bb0 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/configuration/ServiceRegistrationManager.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/configuration/ServiceRegistrationManager.java @@ -1,41 +1,18 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/configuration/ServiceRegistrationMessages.groovy b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/configuration/ServiceRegistrationMessages.groovy index a163b53f2bf..9d0461cfbec 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/configuration/ServiceRegistrationMessages.groovy +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/configuration/ServiceRegistrationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID package com.eucalyptus.empyrean.configuration diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractPersistent.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractPersistent.java index 79a6e2e995c..2d6cb5efa83 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractPersistent.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractPersistent.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractStatefulPersistent.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractStatefulPersistent.java index 0dbeb70ab77..1eda8afeece 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractStatefulPersistent.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractStatefulPersistent.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AccountMetadata.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AccountMetadata.java index 88c507ed7d5..cb247541bf6 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AccountMetadata.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AccountMetadata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/DelegatingInterceptor.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/DelegatingInterceptor.java index cafdc5b3021..9606f4c6de3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/DelegatingInterceptor.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/DelegatingInterceptor.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Entities.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Entities.java index a2265b5c6c1..77543f1a561 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Entities.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Entities.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/GlobalUserMetadata.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/GlobalUserMetadata.java index 01274532bcf..5efa43f2f21 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/GlobalUserMetadata.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/GlobalUserMetadata.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Interceptors.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Interceptors.java index 924fb64ad81..71c93c7d77a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Interceptors.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Interceptors.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContextDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContextDiscovery.java index f6a4b470649..34d10a632f9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContextDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContextDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java index 0c3d056061f..8148739db0a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceExceptions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceExceptions.java index 17ad0f531a6..e30049b468d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceExceptions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceExceptions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/RecoverablePersistenceException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/RecoverablePersistenceException.java index 8bd7bada477..aeed3706db8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/RecoverablePersistenceException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/RecoverablePersistenceException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionCallbackException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionCallbackException.java index 6cdc0186c6a..57cca13d133 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionCallbackException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionCallbackException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionException.java index 1827c49e129..e7dd67392ba 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionExecutionException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionExecutionException.java index a83a9bf9af2..e23763cc62f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionExecutionException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionExecutionException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionInternalException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionInternalException.java index 1af3e4587c9..5f9e9a6ebb7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionInternalException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransactionInternalException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Transactions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Transactions.java index fb83f463fb1..0eee4331527 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Transactions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/Transactions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransientEntityException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransientEntityException.java index 01bc17a9842..d9a4ee8e139 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransientEntityException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/TransientEntityException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/UserMetadata.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/UserMetadata.java index 61c629cf69c..49d9b9eac02 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/UserMetadata.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/UserMetadata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.entities; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/AbstractNamedRegistry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/AbstractNamedRegistry.java index 217289b5a82..d96bcb1b2b9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/AbstractNamedRegistry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/AbstractNamedRegistry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/ClockTick.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/ClockTick.java index e08240f9cdf..47a65471ade 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/ClockTick.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/ClockTick.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/Event.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/Event.java index e2e68255d05..9c912b14963 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/Event.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/Event.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventFailedException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventFailedException.java index 4ba6fe1b76c..4e9f8eb224c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventFailedException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventFailedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListener.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListener.java index 365cfd018f6..2d8453d29bd 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListener.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListener.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListenerDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListenerDiscovery.java index e21f26b2ab9..48947fd65ff 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListenerDiscovery.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/EventListenerDiscovery.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/GenericEvent.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/GenericEvent.java index b9137d80ee2..5f8a5581f55 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/GenericEvent.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/GenericEvent.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/Hertz.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/Hertz.java index 283761d4fdf..a691b5cca47 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/Hertz.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/Hertz.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/ListenerRegistry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/ListenerRegistry.java index da8eaad099a..f616d976013 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/ListenerRegistry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/ListenerRegistry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/Listeners.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/Listeners.java index ef8da7cea37..5001d9533b6 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/Listeners.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/Listeners.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/ReferentialEvent.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/ReferentialEvent.java index 3b84f7f7422..2ebc5b68d0b 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/ReferentialEvent.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/ReferentialEvent.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/StatefulNamedRegistry.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/StatefulNamedRegistry.java index 23b168f6a98..1034cd20675 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/StatefulNamedRegistry.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/StatefulNamedRegistry.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/event/SystemClock.java b/clc/modules/msgs/src/main/java/com/eucalyptus/event/SystemClock.java index f9ff6e465f6..87b05954ad9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/event/SystemClock.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/event/SystemClock.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.event; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpMessage.java b/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpMessage.java index 881f42d53b6..731ac34e551 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpMessage.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpMessage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.http; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpRequest.java b/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpRequest.java index 8159906ff80..36916639572 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpRequest.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpRequest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.http; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpResponse.java b/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpResponse.java index 8ef9508d59a..9b13808b1bc 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpResponse.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/http/MappingHttpResponse.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.http; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/images/NoSuchImageException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/images/NoSuchImageException.java index 33c7c77c3f1..b80210c1b3c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/images/NoSuchImageException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/images/NoSuchImageException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.images; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/BaseRecord.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/BaseRecord.java index 942454ca8ee..094b52160ab 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/BaseRecord.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/BaseRecord.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventClass.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventClass.java index d49deb52d8d..f80602eabf1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventClass.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventClass.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventRecord.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventRecord.java index 677fb9e654c..6f99b95a7c2 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventRecord.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventRecord.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventType.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventType.java index c1ca54bd37a..ed4133c27f3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventType.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/EventType.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/LogFileRecord.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/LogFileRecord.java index 003ad680743..4de2d432029 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/LogFileRecord.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/LogFileRecord.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/Logs.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/Logs.java index 2349e646081..6e514c17efa 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/Logs.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/Logs.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/Record.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/Record.java index 8f46a78b33e..87487fda64e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/Record.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/Record.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordFilter.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordFilter.java index 62c30f47527..4e171f3ff7f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordFilter.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordFilter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordLevel.java b/clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordLevel.java index bacedb07bd8..d209fedb415 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordLevel.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/records/RecordLevel.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.records; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/scripting/Groovyness.java b/clc/modules/msgs/src/main/java/com/eucalyptus/scripting/Groovyness.java index da2ed1ba95a..cf3e5a30867 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/scripting/Groovyness.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/scripting/Groovyness.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.scripting; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/scripting/ScriptExecutionFailedException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/scripting/ScriptExecutionFailedException.java index 6368e96e2ca..001b35e5235 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/scripting/ScriptExecutionFailedException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/scripting/ScriptExecutionFailedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.scripting; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/Ats.java b/clc/modules/msgs/src/main/java/com/eucalyptus/system/Ats.java index 1c0a2272033..a605dd3f3b1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/Ats.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/Ats.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.system; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/BaseDirectory.java b/clc/modules/msgs/src/main/java/com/eucalyptus/system/BaseDirectory.java index 51845531e29..feee48dfc12 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/BaseDirectory.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/BaseDirectory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.system; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/DirectoryBootstrapper.java b/clc/modules/msgs/src/main/java/com/eucalyptus/system/DirectoryBootstrapper.java index c395f00e38d..84a5ca5ccbb 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/DirectoryBootstrapper.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/DirectoryBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.system; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/EucaLayout.java b/clc/modules/msgs/src/main/java/com/eucalyptus/system/EucaLayout.java index 99e6ec4bd13..a645fc53d54 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/EucaLayout.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/EucaLayout.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.system; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/SubDirectory.java b/clc/modules/msgs/src/main/java/com/eucalyptus/system/SubDirectory.java index 8a6e78468d9..f8a101a13f0 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/SubDirectory.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/SubDirectory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.system; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/log/LoggingResetter.java b/clc/modules/msgs/src/main/java/com/eucalyptus/system/log/LoggingResetter.java index e892e59d666..ce8e58232c8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/log/LoggingResetter.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/log/LoggingResetter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.system.log; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/ByteArray.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/ByteArray.java index 1a553e1bdd3..b67d8282541 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/ByteArray.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/ByteArray.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Callback.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Callback.java index 869a14836de..8cc2adf02c3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Callback.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Callback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Classes.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Classes.java index 699bcba112f..705aed0fc9d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Classes.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Classes.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composite.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composite.java index 0ce3ebd5fc7..a7a260bc0ff 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composite.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composite.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/CompositeHelper.groovy b/clc/modules/msgs/src/main/java/com/eucalyptus/util/CompositeHelper.groovy index 55992ce0ce4..970930f27a2 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/CompositeHelper.groovy +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/CompositeHelper.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composites.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composites.java index ee45e1fe862..85c43bac015 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composites.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composites.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/DNSProperties.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/DNSProperties.java index e2a9a88cfdc..d84f01aea50 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/DNSProperties.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/DNSProperties.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Dates.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Dates.java index f9767fd380d..e809233e6b9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Dates.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Dates.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Emails.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Emails.java index 628f08dfc40..1730ca23aa1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Emails.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Emails.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusCloudException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusCloudException.java index 14488bb1917..b445fd582ce 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusCloudException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusCloudException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusClusterException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusClusterException.java index bc83be55ade..253ca598c8c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusClusterException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusClusterException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusUnsupportedOperationException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusUnsupportedOperationException.java index 68fafe3255c..4ee2185d0d3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusUnsupportedOperationException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/EucalyptusUnsupportedOperationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java index 10770f5df86..c9da6167e40 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Expendable.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Expendable.java index 18af0df4589..f75adead9f7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Expendable.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Expendable.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/ExposedCommand.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/ExposedCommand.java index 35d63a3fb43..1e430377e59 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/ExposedCommand.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/ExposedCommand.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Fields.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Fields.java index 11de97721f7..6187e0f0b5e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Fields.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Fields.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Filterable.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Filterable.java index 245ea4b06cf..6da27537198 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Filterable.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Filterable.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/FinalReturn.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/FinalReturn.java index c2599941336..0bf27f1eb19 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/FinalReturn.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/FinalReturn.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasFullName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasFullName.java index 45b1d554934..cce5946b147 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasFullName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasFullName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasName.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasName.java index 51591b3cff2..3b9416b15f1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasName.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasNaturalId.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasNaturalId.java index 67a96e20ff3..453b5a57021 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasNaturalId.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasNaturalId.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasParent.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasParent.java index b25fe283631..ffe8163ed5e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasParent.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasParent.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasSideEffect.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasSideEffect.java index 90e10a1cafb..dd69fdd3719 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasSideEffect.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/HasSideEffect.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Internets.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Internets.java index 8a8b0496bf1..c9d9ddb84c8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Internets.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Internets.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/InvalidCredentialsException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/InvalidCredentialsException.java index 9e78732f1e9..cb510c4c3b5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/InvalidCredentialsException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/InvalidCredentialsException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/LogUtil.groovy b/clc/modules/msgs/src/main/java/com/eucalyptus/util/LogUtil.groovy index 7503c72cb21..8c4f75e0f3a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/LogUtil.groovy +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/LogUtil.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Mappable.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Mappable.java index fc60bf1ba4c..c189dfd1016 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Mappable.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Mappable.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Mbeans.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Mbeans.java index 4271f467750..c73b2da28d6 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Mbeans.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Mbeans.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferences.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferences.java index 010ca6c6026..f366f22e905 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferences.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferences.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferencesFactory.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferencesFactory.java index 1f3b21638f8..3b34a1a265e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferencesFactory.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferencesFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Numbers.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Numbers.java index 5b65eb71d67..0c613a584a9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Numbers.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Numbers.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/RESTException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/RESTException.java index c079d224b92..f3c16c90e41 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/RESTException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/RESTException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/RestrictedTypes.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/RestrictedTypes.java index 43a7a80bec2..9204c0eeb42 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/RestrictedTypes.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/RestrictedTypes.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/ServiceProcess.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/ServiceProcess.java index 7d0a715e95a..284c7253e84 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/ServiceProcess.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/ServiceProcess.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Subnets.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Subnets.java index b6e3a7e1cb4..9fe6b3c45c1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Subnets.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Subnets.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Templates.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Templates.java index 62d60fed4ec..7e500776f89 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Templates.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Templates.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/TimedEvictionSet.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/TimedEvictionSet.java index be6a737aa65..a1e19ccd97d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/TimedEvictionSet.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/TimedEvictionSet.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Timers.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Timers.java index 967cb5c7c40..0eb5d227e4d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Timers.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Timers.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Tx.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Tx.java index d12ef87c503..166ad98d291 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Tx.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Tx.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/TypeMapper.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/TypeMapper.java index b9247d4e256..2b4de3e7fa1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/TypeMapper.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/TypeMapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/TypeMappers.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/TypeMappers.java index 960c916933c..711d62e35ce 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/TypeMappers.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/TypeMappers.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/UniqueIds.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/UniqueIds.java index 2d207a3d381..6457930a170 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/UniqueIds.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/UniqueIds.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/UserDatas.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/UserDatas.java index 04d70f19605..7639c558fc3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/UserDatas.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/UserDatas.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/XMLParser.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/XMLParser.java index 715586b44ba..9b7e0c43e32 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/XMLParser.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/XMLParser.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequest.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequest.java index b00d811e30d..0a622503787 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequest.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequestHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequestHandler.java index 6ad93db17bd..3654aada337 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequestHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequestHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequests.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequests.java index 57523f29b84..be055f643e0 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequests.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncRequests.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncResponseFuture.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncResponseFuture.java index 319fe0ff8f6..f5745cc6c22 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncResponseFuture.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/AsyncResponseFuture.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/BroadcastCallback.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/BroadcastCallback.java index 1fbfe83ef5f..2ceab4f3210 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/BroadcastCallback.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/BroadcastCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CallbackFactory.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CallbackFactory.java index 539d308f4ee..1933c31c763 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CallbackFactory.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CallbackFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CallbackListenerSequence.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CallbackListenerSequence.java index a00c36cefeb..4131b2d17fb 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CallbackListenerSequence.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CallbackListenerSequence.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Callbacks.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Callbacks.java index 1ee4fc41bd2..f089a2c99ea 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Callbacks.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Callbacks.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CheckedListenableFuture.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CheckedListenableFuture.java index 6b9a4ce294a..9546359f400 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CheckedListenableFuture.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/CheckedListenableFuture.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/ConnectionException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/ConnectionException.java index d790dde4680..aefbf3931e7 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/ConnectionException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/ConnectionException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Factory.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Factory.java index 9a8cbb383d8..5314cd88e39 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Factory.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Factory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/FailedRequestException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/FailedRequestException.java index 779abb68632..3c64cfccdbb 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/FailedRequestException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/FailedRequestException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/MessageCallback.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/MessageCallback.java index 77f855ec982..8ca4673802f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/MessageCallback.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/MessageCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/NOOP.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/NOOP.java index 1f6a8cf053a..710af54763d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/NOOP.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/NOOP.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/NoResponseException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/NoResponseException.java index edd9c80cf92..dc735b7e0ea 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/NoResponseException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/NoResponseException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RemoteCallback.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RemoteCallback.java index 1d8a8e83bdc..0c0581af4f1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RemoteCallback.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RemoteCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RemoteCallbackFactory.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RemoteCallbackFactory.java index ffa22374947..12215019c24 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RemoteCallbackFactory.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RemoteCallbackFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Request.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Request.java index 3b15d43856b..317f752c6b3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Request.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Request.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestException.java index 14f90798ecc..ec2df8724a4 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestHandler.java index b278eec5ce6..da7abd99854 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestInitializationException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestInitializationException.java index 4edcd688e99..016cb53012a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestInitializationException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RequestInitializationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RetryableConnectionException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RetryableConnectionException.java index adcd005cddc..a7b98246571 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RetryableConnectionException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/RetryableConnectionException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/SubjectMessageCallback.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/SubjectMessageCallback.java index cefd414a5b8..00681941885 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/SubjectMessageCallback.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/SubjectMessageCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/SubjectRemoteCallbackFactory.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/SubjectRemoteCallbackFactory.java index 950f7fafacc..085e2e7274b 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/SubjectRemoteCallbackFactory.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/SubjectRemoteCallbackFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/UnconditionalCallback.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/UnconditionalCallback.java index 09486e1aaec..ffc5800dbc9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/UnconditionalCallback.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/UnconditionalCallback.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/UnknownMessageTypeException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/UnknownMessageTypeException.java index f22ca1be06c..586c1314041 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/UnknownMessageTypeException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/async/UnknownMessageTypeException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.async; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/concurrent/GenericCheckedListenableFuture.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/concurrent/GenericCheckedListenableFuture.java index 902733d48bc..e184bce2124 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/concurrent/GenericCheckedListenableFuture.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/concurrent/GenericCheckedListenableFuture.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.concurrent; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DnsResolvers.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DnsResolvers.java index 2fae995a01f..a81e7e1c99e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DnsResolvers.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DnsResolvers.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DomainNameRecords.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DomainNameRecords.java index 267c86cfb73..b58c57f59da 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DomainNameRecords.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DomainNameRecords.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DomainNames.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DomainNames.java index cefd0cb940d..8b07d413e66 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DomainNames.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/DomainNames.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.dns; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/NameserverResolver.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/NameserverResolver.java index 645caca2601..7b7b7f7d643 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/NameserverResolver.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/dns/NameserverResolver.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.util.dns; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AbstractTransitionAction.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AbstractTransitionAction.java index b03647cb928..8437dc22e15 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AbstractTransitionAction.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AbstractTransitionAction.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java index ce31126e979..0a6a3594f4a 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Automata.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Automata.java index e8765cb21b5..b1591c30154 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Automata.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Automata.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/ExistingTransitionException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/ExistingTransitionException.java index 554b607dfd3..413927812d3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/ExistingTransitionException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/ExistingTransitionException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/HasStateMachine.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/HasStateMachine.java index e6750390f35..c34106c5c63 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/HasStateMachine.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/HasStateMachine.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/SplitTransition.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/SplitTransition.java index 04069da069a..197063017af 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/SplitTransition.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/SplitTransition.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachine.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachine.java index e6f883c3d89..8109b1a21e0 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachine.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachine.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java index 30b4dd6581d..fd8bc19ec28 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionAction.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionAction.java index ac12c89cd96..5a1ff77e632 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionAction.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionAction.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionException.java index fa1db295e7b..4b6d4156ed6 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionHandler.java index 7bf19bcf281..0aa86830bff 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionImpl.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionImpl.java index 7eecd538823..1233034c610 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionImpl.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionImpl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionListener.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionListener.java index 1723a542421..ce6bc557ab1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionListener.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionListener.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionListenerException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionListenerException.java index abf760220e2..8a6229783a4 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionListenerException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionListenerException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionRecord.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionRecord.java index 3c048ec6beb..7153740e112 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionRecord.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionRecord.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionRule.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionRule.java index e378d83749e..ad7d282bab6 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionRule.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/TransitionRule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Transitions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Transitions.java index e3045747823..d868c95ed3f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Transitions.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/Transitions.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.util.fsm; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/techpreview/TechPreviews.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/techpreview/TechPreviews.java index a79cc1610f0..fa78f26d986 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/techpreview/TechPreviews.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/techpreview/TechPreviews.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/Client.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/Client.java index e2654d3be1c..31571c4cae5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/Client.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/Client.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/EucalyptusRemoteFault.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/EucalyptusRemoteFault.java index e531a8b74d5..7b27c5740a9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/EucalyptusRemoteFault.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/EucalyptusRemoteFault.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/Handlers.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/Handlers.java index e0e9bc85ba6..e7f975c4061 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/Handlers.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/Handlers.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/ServiceNotReadyException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/ServiceNotReadyException.java index 5d8fc172238..4ed43fbb051 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/ServiceNotReadyException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/ServiceNotReadyException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/StackConfiguration.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/StackConfiguration.java index 7047f471957..0948040ad24 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/StackConfiguration.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/StackConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/TransportDefinition.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/TransportDefinition.java index d2ec7b0f594..26f46c0854e 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/TransportDefinition.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/TransportDefinition.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServices.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServices.java index 421a0c8cad4..8c96eb9375b 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServices.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServices.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServicesException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServicesException.java index 8ca41d5cd3a..3743ea28006 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServicesException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServicesException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/NioClient.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/NioClient.java index 3f97f0d6b4a..f3ef5266353 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/NioClient.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/NioClient.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.client; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/ServiceDispatcher.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/ServiceDispatcher.java index 56c222c98cd..ff1bd424c5d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/ServiceDispatcher.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/ServiceDispatcher.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.client; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/BindingHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/BindingHandler.java index 53b45ddfb44..d57eb5c0a05 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/BindingHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/BindingHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/ClusterWsSecHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/ClusterWsSecHandler.java index ffa080ed253..addde76733d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/ClusterWsSecHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/ClusterWsSecHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/HmacHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/HmacHandler.java index bcc3e5b7126..d2f7b945223 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/HmacHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/HmacHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/InternalWsSecHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/InternalWsSecHandler.java index c1006b8cb24..c368b1bcd9d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/InternalWsSecHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/InternalWsSecHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/MessageStackHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/MessageStackHandler.java index 5a2a4e4d099..76b86b597c4 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/MessageStackHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/MessageStackHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/NodeWsSecHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/NodeWsSecHandler.java index d940c89e0ab..c91d64812b9 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/NodeWsSecHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/NodeWsSecHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/QueryTimestampHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/QueryTimestampHandler.java index 4aa8ede99b1..527b277bffa 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/QueryTimestampHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/QueryTimestampHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/ResponseHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/ResponseHandler.java index b35c1b041b2..33b4b4122d0 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/ResponseHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/ResponseHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/RestfulMarshallingHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/RestfulMarshallingHandler.java index 630313943ea..f790310fa38 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/RestfulMarshallingHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/RestfulMarshallingHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/SoapMarshallingHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/SoapMarshallingHandler.java index cc0d677527e..e989426a393 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/SoapMarshallingHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/SoapMarshallingHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/UserWsSecHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/UserWsSecHandler.java index ed718aa96e8..206ea05371d 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/UserWsSecHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/UserWsSecHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java index b9b96fc7b04..4bdac25ef87 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/HttpException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/HttpException.java index 340bf8552d4..dce98708476 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/HttpException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/HttpException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers.http; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/HttpUtils.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/HttpUtils.java index 965a16b6812..babac33dab2 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/HttpUtils.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/HttpUtils.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers.http; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpRequestEncoder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpRequestEncoder.java index da120eec1ef..491bb3dfbf4 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpRequestEncoder.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpRequestEncoder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers.http; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/AddressingHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/AddressingHandler.java index 418b101e0d5..22b35b3f9bf 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/AddressingHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/AddressingHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.protocol; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java index 16a4c6d4cb4..0ece84c1f74 100755 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.protocol; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/OperationParameter.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/OperationParameter.java index 04f3b678932..1e36798b4a3 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/OperationParameter.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/OperationParameter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.protocol; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/RequiredQueryParams.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/RequiredQueryParams.java index ec05e1625df..19d6e610c84 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/RequiredQueryParams.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/RequiredQueryParams.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.protocol; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/SoapHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/SoapHandler.java index 68dae43f9a8..c65e8bada3c 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/SoapHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/SoapHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.protocol; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/DuplicatePipelineException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/DuplicatePipelineException.java index a8e822b10f2..2ee7afcd232 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/DuplicatePipelineException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/DuplicatePipelineException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/FilteredPipeline.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/FilteredPipeline.java index cd93a59b86b..8f080203ac5 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/FilteredPipeline.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/FilteredPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/LegacyHBPipeline.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/LegacyHBPipeline.java index 58659d33ca6..7de364e65d1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/LegacyHBPipeline.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/LegacyHBPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/MessageStatistics.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/MessageStatistics.java index fe4cde54f73..aa3adf71dea 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/MessageStatistics.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/MessageStatistics.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/NioServerHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/NioServerHandler.java index 7fbeb8da7ec..728edf278f6 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/NioServerHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/NioServerHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/NoAcceptingPipelineException.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/NoAcceptingPipelineException.java index 1a73c60c609..bad5818571f 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/NoAcceptingPipelineException.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/NoAcceptingPipelineException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/Pipelines.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/Pipelines.java index e1f434b40b6..d5f24df5a82 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/Pipelines.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/Pipelines.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceAccessLoggingHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceAccessLoggingHandler.java index aa2123b9c5d..8a1f2d0bc03 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceAccessLoggingHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceAccessLoggingHandler.java @@ -1,42 +1,19 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * * Redistribution and use of this software in source and binary forms, * with or without modification, are permitted provided that the * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -58,9 +35,7 @@ * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ************************************************************************ - * @author chris grzegorczyk - */ + ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceContextHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceContextHandler.java index 816a5672627..abbcb599651 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceContextHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceContextHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceHackeryHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceHackeryHandler.java index 8922398e284..94fb65a17be 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceHackeryHandler.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/server/ServiceHackeryHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.server; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java index e6328abd5b8..08acf317392 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/HmacUtils.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/HmacUtils.java index 6154730cd08..1cca4f6b4c8 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/HmacUtils.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/HmacUtils.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/ReplyQueue.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/ReplyQueue.java index 2d8092ce72e..cff10c78ad1 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/ReplyQueue.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/ReplyQueue.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.util; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/RequestQueue.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/RequestQueue.java index 7d6bfc02bd0..833e3b23c04 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/RequestQueue.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/RequestQueue.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.util; diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/Extra.groovy b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/Extra.groovy index 7637eee215e..d2e627f4382 100644 --- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/Extra.groovy +++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/Extra.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java index 0b2154e3238..651a29378c7 100644 --- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java +++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.cloud.entities; diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/IsData.java b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/IsData.java index 9cc8bac52dc..d05bb4de848 100644 --- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/IsData.java +++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/constants/IsData.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.constants; diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseData.java b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseData.java index 5128b95c13f..9805e0d2319 100644 --- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseData.java +++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseData.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.msgs; diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java index 7ce6f8c217e..03ec062fe46 100644 --- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java +++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.msgs; diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/HasRequest.java b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/HasRequest.java index e6d1cf42588..1965265cd1c 100644 --- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/HasRequest.java +++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/HasRequest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.msgs; diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Messages.groovy b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Messages.groovy index 5bbc923bfe3..b49f7396d28 100644 --- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Messages.groovy +++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Messages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/StreamedBaseMessage.java b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/StreamedBaseMessage.java index b455d9cd4db..f33b4a7d8f9 100644 --- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/StreamedBaseMessage.java +++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/StreamedBaseMessage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package edu.ucsb.eucalyptus.msgs; diff --git a/clc/modules/msgs/src/test/groovy/dump_heap.groovy b/clc/modules/msgs/src/test/groovy/dump_heap.groovy index c4b2c704c0a..4cdc24df487 100644 --- a/clc/modules/msgs/src/test/groovy/dump_heap.groovy +++ b/clc/modules/msgs/src/test/groovy/dump_heap.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import java.lang.management.ManagementFactory diff --git a/clc/modules/msgs/src/test/groovy/sync_test.groovy b/clc/modules/msgs/src/test/groovy/sync_test.groovy index cc3d835c180..5a875b4e9dc 100644 --- a/clc/modules/msgs/src/test/groovy/sync_test.groovy +++ b/clc/modules/msgs/src/test/groovy/sync_test.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import java.util.concurrent.TimeUnit diff --git a/clc/modules/msgs/src/test/java/com/eucalyptus/auth/login/HmacLoginModuleTest.java b/clc/modules/msgs/src/test/java/com/eucalyptus/auth/login/HmacLoginModuleTest.java index 75eff0e38d7..0a4e61e6ec3 100644 --- a/clc/modules/msgs/src/test/java/com/eucalyptus/auth/login/HmacLoginModuleTest.java +++ b/clc/modules/msgs/src/test/java/com/eucalyptus/auth/login/HmacLoginModuleTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.login; diff --git a/clc/modules/msgs/src/test/java/com/eucalyptus/auth/policy/PolicyParserTest.java b/clc/modules/msgs/src/test/java/com/eucalyptus/auth/policy/PolicyParserTest.java index 9144f86e8ee..6c131ddafd7 100644 --- a/clc/modules/msgs/src/test/java/com/eucalyptus/auth/policy/PolicyParserTest.java +++ b/clc/modules/msgs/src/test/java/com/eucalyptus/auth/policy/PolicyParserTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.auth.policy; diff --git a/clc/modules/msgs/src/test/java/com/eucalyptus/crypto/StringCryptoTest.java b/clc/modules/msgs/src/test/java/com/eucalyptus/crypto/StringCryptoTest.java index 009dc1bf373..11bf0bfa106 100644 --- a/clc/modules/msgs/src/test/java/com/eucalyptus/crypto/StringCryptoTest.java +++ b/clc/modules/msgs/src/test/java/com/eucalyptus/crypto/StringCryptoTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto; diff --git a/clc/modules/msgs/src/test/java/com/eucalyptus/crypto/util/SslUtilsTest.java b/clc/modules/msgs/src/test/java/com/eucalyptus/crypto/util/SslUtilsTest.java index f8ba499d32a..2c98031eb55 100644 --- a/clc/modules/msgs/src/test/java/com/eucalyptus/crypto/util/SslUtilsTest.java +++ b/clc/modules/msgs/src/test/java/com/eucalyptus/crypto/util/SslUtilsTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.crypto.util; diff --git a/clc/modules/notifications/src/main/java/com/eucalyptus/notifications/NotificationsMessages.groovy b/clc/modules/notifications/src/main/java/com/eucalyptus/notifications/NotificationsMessages.groovy index 000aa1000f9..64293bd0371 100644 --- a/clc/modules/notifications/src/main/java/com/eucalyptus/notifications/NotificationsMessages.groovy +++ b/clc/modules/notifications/src/main/java/com/eucalyptus/notifications/NotificationsMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/notifications/src/main/java/com/eucalyptus/notifications/NotificationsService.java b/clc/modules/notifications/src/main/java/com/eucalyptus/notifications/NotificationsService.java index 45f83813a20..2f6dee53bc6 100644 --- a/clc/modules/notifications/src/main/java/com/eucalyptus/notifications/NotificationsService.java +++ b/clc/modules/notifications/src/main/java/com/eucalyptus/notifications/NotificationsService.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.notifications; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/ObjectStorage.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/ObjectStorage.java index 83604e0fe03..6f96e027e01 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/ObjectStorage.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/ObjectStorage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/client/GenericS3ClientFactoryConfiguration.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/client/GenericS3ClientFactoryConfiguration.java index b5d5dc6ff67..4a1b3cd6893 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/client/GenericS3ClientFactoryConfiguration.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/client/GenericS3ClientFactoryConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.client; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/CorsRule.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/CorsRule.java index c4154c2ee28..be79bb84c7d 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/CorsRule.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/CorsRule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.entities; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/LifecycleRule.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/LifecycleRule.java index a813cccbf0c..293325b53a3 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/LifecycleRule.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/LifecycleRule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.entities; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ObjectStorageConfiguration.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ObjectStorageConfiguration.java index e31c57cbb65..c32d54fce22 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ObjectStorageConfiguration.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ObjectStorageConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.entities; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ObjectStorageGlobalConfiguration.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ObjectStorageGlobalConfiguration.java index 819d34548d7..413ce354c40 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ObjectStorageGlobalConfiguration.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ObjectStorageGlobalConfiguration.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.entities; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ScheduledJob.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ScheduledJob.java index 4b722c83e34..7754868e2e7 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ScheduledJob.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/ScheduledJob.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.entities; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/TorrentInfo.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/TorrentInfo.java index dfb5dddd596..d4151e04af0 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/TorrentInfo.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/entities/TorrentInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.entities; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/exceptions/ObjectStorageException.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/exceptions/ObjectStorageException.java index 8e4190d59d3..05ffea7c316 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/exceptions/ObjectStorageException.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/exceptions/ObjectStorageException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.exceptions; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataMessage.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataMessage.java index 61ee764c355..a9ef7826835 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataMessage.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataMessage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.msgs; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataMessenger.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataMessenger.java index 1efdcde4310..b3b1154f82f 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataMessenger.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataMessenger.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.msgs; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataQueue.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataQueue.java index 639cb8ca928..4a21facf171 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataQueue.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageDataQueue.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.msgs; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageMonitor.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageMonitor.java index db4e455c8a9..c91007ba813 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageMonitor.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/ObjectStorageMonitor.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.msgs; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/OsgConfigurationMessages.groovy b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/OsgConfigurationMessages.groovy index fb1c63c00db..918f964678a 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/OsgConfigurationMessages.groovy +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/msgs/OsgConfigurationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/policy/S3ResourceName.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/policy/S3ResourceName.java index babfcd6b2d2..d06954c2d21 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/policy/S3ResourceName.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/policy/S3ResourceName.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.policy; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/providers/PoolableProviderClientFactory.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/providers/PoolableProviderClientFactory.java index 670c5747383..24dc87eb960 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/providers/PoolableProviderClientFactory.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/providers/PoolableProviderClientFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.providers; diff --git a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/util/OSGUtil.java b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/util/OSGUtil.java index f2c093a6365..fdc96e876e2 100644 --- a/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/util/OSGUtil.java +++ b/clc/modules/object-storage-common/src/main/java/com/eucalyptus/objectstorage/util/OSGUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.util; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/ObjectStorageBucketLogger.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/ObjectStorageBucketLogger.java index 51e1d08e176..c8ceceeefb6 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/ObjectStorageBucketLogger.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/ObjectStorageBucketLogger.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/TorrentClient.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/TorrentClient.java index df5bf10ed6b..dd9502f140b 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/TorrentClient.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/TorrentClient.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.bittorrent; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/TorrentCreator.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/TorrentCreator.java index 0ecd557eb12..8ca15562271 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/TorrentCreator.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/TorrentCreator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.bittorrent; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/Torrents.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/Torrents.java index 988e366596a..41d7b887cb9 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/Torrents.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/Torrents.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.bittorrent; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/Tracker.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/Tracker.java index b737730d3e5..7ada0655101 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/Tracker.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bittorrent/Tracker.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.bittorrent; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bootstrap/ObjectStorageSchedulerManager.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bootstrap/ObjectStorageSchedulerManager.java index ea6abf61863..9a59385a0fd 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bootstrap/ObjectStorageSchedulerManager.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bootstrap/ObjectStorageSchedulerManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.bootstrap; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bootstrap/OsgBootstrapper.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bootstrap/OsgBootstrapper.java index 2105d9389fa..a91c7d2f828 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bootstrap/OsgBootstrapper.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/bootstrap/OsgBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.bootstrap; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/config/OsgBuilder.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/config/OsgBuilder.java index f5332944a7b..9363aad8cc0 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/config/OsgBuilder.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/config/OsgBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.config; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/LifecycleReaperJob.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/LifecycleReaperJob.java index 336aeb781b9..e81e29573cc 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/LifecycleReaperJob.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/LifecycleReaperJob.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.jobs; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/MainBucketReaperJob.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/MainBucketReaperJob.java index 561ba06b106..ca32779492c 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/MainBucketReaperJob.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/MainBucketReaperJob.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.jobs; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/MainObjectReaperJob.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/MainObjectReaperJob.java index 7e7ce563def..cc952091f9a 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/MainObjectReaperJob.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/jobs/MainObjectReaperJob.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.jobs; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketCorsManager.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketCorsManager.java index 1a1c08eaa69..80dabfd4694 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketCorsManager.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketCorsManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.metadata; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketLifecycleManager.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketLifecycleManager.java index 568807208b3..820163fc380 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketLifecycleManager.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketLifecycleManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.metadata; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketNameValidatorRepo.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketNameValidatorRepo.java index c7fa84b4168..59adf2a5927 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketNameValidatorRepo.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/BucketNameValidatorRepo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.metadata; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/DbBucketCorsManagerImpl.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/DbBucketCorsManagerImpl.java index 41479cfab27..957bcda5279 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/DbBucketCorsManagerImpl.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/DbBucketCorsManagerImpl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.metadata; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/DbBucketLifecycleManagerImpl.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/DbBucketLifecycleManagerImpl.java index ef1c57ca9e2..521a64b0a24 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/DbBucketLifecycleManagerImpl.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/DbBucketLifecycleManagerImpl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.metadata; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/Validator.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/Validator.java index 9315f547c2a..186de12d20c 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/Validator.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/metadata/Validator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.metadata; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageDELETEPipeline.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageDELETEPipeline.java index d46005a0c87..b559c15cafb 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageDELETEPipeline.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageDELETEPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageFormPOSTPipeline.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageFormPOSTPipeline.java index 97a16360bcb..d71f9df4842 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageFormPOSTPipeline.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageFormPOSTPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageGETPipeline.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageGETPipeline.java index 27696ba6f95..0b571ea6ff2 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageGETPipeline.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageGETPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageHEADPipeline.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageHEADPipeline.java index 2c146224500..f215a4d8a66 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageHEADPipeline.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageHEADPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageOPTIONSPipeline.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageOPTIONSPipeline.java index 9a2536181f8..982cd59b75c 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageOPTIONSPipeline.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageOPTIONSPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStoragePUTDataPipeline.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStoragePUTDataPipeline.java index cfe789cae29..8b6b9b368e0 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStoragePUTDataPipeline.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStoragePUTDataPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStoragePUTMetadataPipeline.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStoragePUTMetadataPipeline.java index d3ab46c1543..7cf3094386c 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStoragePUTMetadataPipeline.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStoragePUTMetadataPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageRESTPipeline.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageRESTPipeline.java index d0c47ebfdd6..68073b9561b 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageRESTPipeline.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/ObjectStorageRESTPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/auth/ObjectStorageLoginModule.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/auth/ObjectStorageLoginModule.java index f0b2036f740..fcb9e112799 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/auth/ObjectStorageLoginModule.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/auth/ObjectStorageLoginModule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.auth; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/auth/ObjectStorageWrappedCredentials.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/auth/ObjectStorageWrappedCredentials.java index 46b65d8af29..38fe56ce09f 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/auth/ObjectStorageWrappedCredentials.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/auth/ObjectStorageWrappedCredentials.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.auth; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageDELETEBinding.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageDELETEBinding.java index ef4e95a1c57..9c7a0da81f1 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageDELETEBinding.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageDELETEBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.binding; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageFormPOSTBinding.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageFormPOSTBinding.java index 8e09effa440..0671429146b 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageFormPOSTBinding.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageFormPOSTBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.binding; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageGETBinding.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageGETBinding.java index f0a7d52e499..484b9d9e0f1 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageGETBinding.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageGETBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.binding; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageHEADBinding.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageHEADBinding.java index 10984e03122..0795cd1473a 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageHEADBinding.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageHEADBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.binding; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageOPTIONSBinding.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageOPTIONSBinding.java index 49c9aeef8e0..3c4440b4346 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageOPTIONSBinding.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageOPTIONSBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.binding; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStoragePUTBinding.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStoragePUTBinding.java index 63fa7752df3..5b0f465c9d3 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStoragePUTBinding.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStoragePUTBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.binding; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageRESTBinding.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageRESTBinding.java index e843a5900ab..632ad2bb252 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageRESTBinding.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/binding/ObjectStorageRESTBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.binding; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/HttpThresholdBufferingAggregator.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/HttpThresholdBufferingAggregator.java index 3a31ed696b1..09df4c2ae09 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/HttpThresholdBufferingAggregator.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/HttpThresholdBufferingAggregator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageAuthenticationAggregator.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageAuthenticationAggregator.java index 827c10b95b2..ae48fa78684 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageAuthenticationAggregator.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageAuthenticationAggregator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageAuthenticationHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageAuthenticationHandler.java index f38c9f00fd8..9345ca7e016 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageAuthenticationHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageAuthenticationHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageBasicOutboundHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageBasicOutboundHandler.java index 37b8e7aa34f..6b227fa071e 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageBasicOutboundHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageBasicOutboundHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageDELETEOutboundHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageDELETEOutboundHandler.java index e1d4eb6686f..d0764fa0b15 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageDELETEOutboundHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageDELETEOutboundHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageFormPOSTAuthenticationHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageFormPOSTAuthenticationHandler.java index 066236239e7..829e5e1aefd 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageFormPOSTAuthenticationHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageFormPOSTAuthenticationHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageGETOutboundHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageGETOutboundHandler.java index 2126c42ca3f..80b1924a578 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageGETOutboundHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageGETOutboundHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageHEADOutboundHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageHEADOutboundHandler.java index 01b6ea275b0..58ca676cacc 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageHEADOutboundHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageHEADOutboundHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageMetadataAggregatorHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageMetadataAggregatorHandler.java index f15a754af3b..509a12d8013 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageMetadataAggregatorHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageMetadataAggregatorHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOPTIONSOutboundHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOPTIONSOutboundHandler.java index 12f8ef06cb1..db24d10e2cc 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOPTIONSOutboundHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOPTIONSOutboundHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOutboundExceptionHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOutboundExceptionHandler.java index 7f9f47c7c4a..08f10a00816 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOutboundExceptionHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOutboundExceptionHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOutboundHandler.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOutboundHandler.java index c55e8aaaeb0..e6f28fdd0ab 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOutboundHandler.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/ObjectStorageOutboundHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/UploadPolicyChecker.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/UploadPolicyChecker.java index a778cf1374e..ead477d03a0 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/UploadPolicyChecker.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/handlers/UploadPolicyChecker.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.handlers; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageAuthenticationAggregatorStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageAuthenticationAggregatorStage.java index 0a673c5597f..26804150895 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageAuthenticationAggregatorStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageAuthenticationAggregatorStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageDELETEBindingStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageDELETEBindingStage.java index 3e520884c91..b59be1149d9 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageDELETEBindingStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageDELETEBindingStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageDELETEOutboundStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageDELETEOutboundStage.java index fb8be8aa749..159aa5757d4 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageDELETEOutboundStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageDELETEOutboundStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTBindingStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTBindingStage.java index c2c3e72cdd1..220942eebb3 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTBindingStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTBindingStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTOutboundStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTOutboundStage.java index 6c304ec8d4a..09953576799 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTOutboundStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTOutboundStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTUserAuthenticationStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTUserAuthenticationStage.java index 93ef5655a32..1b5e92f183d 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTUserAuthenticationStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageFormPOSTUserAuthenticationStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageGETBindingStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageGETBindingStage.java index a652dd5a8e8..571de578a4d 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageGETBindingStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageGETBindingStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageGETOutboundStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageGETOutboundStage.java index 4f274a84fdc..a41645f8cfa 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageGETOutboundStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageGETOutboundStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageHEADBindingStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageHEADBindingStage.java index d1e79601b38..de044f909f5 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageHEADBindingStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageHEADBindingStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageHEADOutboundStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageHEADOutboundStage.java index 05af430f7ea..a63729a410a 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageHEADOutboundStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageHEADOutboundStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageMetadataAggregatorStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageMetadataAggregatorStage.java index 036c8a0b4ff..b4393817ab8 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageMetadataAggregatorStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageMetadataAggregatorStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOPTIONSBindingStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOPTIONSBindingStage.java index c9b1fd7b48f..4d7a233e889 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOPTIONSBindingStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOPTIONSBindingStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOPTIONSOutboundStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOPTIONSOutboundStage.java index c681a259e0e..54e686e94b3 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOPTIONSOutboundStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOPTIONSOutboundStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOutboundStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOutboundStage.java index a9a8cbc8f63..e80c25cc1a5 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOutboundStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageOutboundStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStoragePUTBindingStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStoragePUTBindingStage.java index 456112db29b..edc17210dca 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStoragePUTBindingStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStoragePUTBindingStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStoragePUTOutboundStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStoragePUTOutboundStage.java index 32b8d497e39..6a348f66bf1 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStoragePUTOutboundStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStoragePUTOutboundStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTBindingStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTBindingStage.java index 32bf4c65060..04946abff2a 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTBindingStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTBindingStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTLoggerInbound.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTLoggerInbound.java index 286dce1039e..bc5c1aa1533 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTLoggerInbound.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTLoggerInbound.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTLoggerOutbound.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTLoggerOutbound.java index f8faa54be9a..1014b7de921 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTLoggerOutbound.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageRESTLoggerOutbound.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageUserAuthenticationStage.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageUserAuthenticationStage.java index 9431b3e64c1..ba5347e295f 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageUserAuthenticationStage.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/pipeline/stages/ObjectStorageUserAuthenticationStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.pipeline.stages; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketNumberQuotaKey.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketNumberQuotaKey.java index 631d705ae46..089b63b7d53 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketNumberQuotaKey.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.policy; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketObjectNumberQuotaKey.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketObjectNumberQuotaKey.java index d72d254495e..b94061176f2 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketObjectNumberQuotaKey.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketObjectNumberQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.policy; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketSizeQuotaKey.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketSizeQuotaKey.java index b68279d43d5..ad6e0641527 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketSizeQuotaKey.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketSizeQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.policy; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketTotalSizeQuotaKey.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketTotalSizeQuotaKey.java index 363a9a893f5..329b6ca0a32 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketTotalSizeQuotaKey.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/BucketTotalSizeQuotaKey.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.policy; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/MaxKeys.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/MaxKeys.java index 0cee531776e..991e0ea6aca 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/MaxKeys.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/MaxKeys.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.policy; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/ObjectStorageQuotaUtil.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/ObjectStorageQuotaUtil.java index 0a638108c22..582d15cb0fa 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/ObjectStorageQuotaUtil.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/policy/ObjectStorageQuotaUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.policy; diff --git a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/providers/walrus/WalrusProviderClient.java b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/providers/walrus/WalrusProviderClient.java index b3d1e2ce31d..6e0ac2b0812 100644 --- a/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/providers/walrus/WalrusProviderClient.java +++ b/clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/providers/walrus/WalrusProviderClient.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.providers.walrus; diff --git a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/OSGBucketTests.java b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/OSGBucketTests.java index b7ca125af16..74ce1e62c77 100644 --- a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/OSGBucketTests.java +++ b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/OSGBucketTests.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage; diff --git a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/ObjectStorageGatewayTest.java b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/ObjectStorageGatewayTest.java index f8c185572ba..59bdca54fdb 100644 --- a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/ObjectStorageGatewayTest.java +++ b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/ObjectStorageGatewayTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage; diff --git a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/ObjectTest.java b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/ObjectTest.java index 3e4ab838422..ce7ff1584f5 100644 --- a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/ObjectTest.java +++ b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/ObjectTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage; diff --git a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/bootstrap/ObjectStorageSchedulerManagerTest.java b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/bootstrap/ObjectStorageSchedulerManagerTest.java index ddb30f90b74..664bcb5c3a9 100644 --- a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/bootstrap/ObjectStorageSchedulerManagerTest.java +++ b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/bootstrap/ObjectStorageSchedulerManagerTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.bootstrap; diff --git a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/metadata/BucketNameValidatorRepoTest.java b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/metadata/BucketNameValidatorRepoTest.java index dd38aeb12b9..40fdc6f4849 100644 --- a/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/metadata/BucketNameValidatorRepoTest.java +++ b/clc/modules/object-storage/src/test/java/com/eucalyptus/objectstorage/metadata/BucketNameValidatorRepoTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.objectstorage.metadata; diff --git a/clc/modules/postgresql/conf/scripts/setup_db.groovy b/clc/modules/postgresql/conf/scripts/setup_db.groovy index 36cf85e8cd1..45d23be3ce1 100644 --- a/clc/modules/postgresql/conf/scripts/setup_db.groovy +++ b/clc/modules/postgresql/conf/scripts/setup_db.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ diff --git a/clc/modules/postgresql/src/main/java/com/eucalyptus/postgresql/PostgreSQLSSLSocketFactory.java b/clc/modules/postgresql/src/main/java/com/eucalyptus/postgresql/PostgreSQLSSLSocketFactory.java index 3cad552d5b7..68c20e72bc5 100644 --- a/clc/modules/postgresql/src/main/java/com/eucalyptus/postgresql/PostgreSQLSSLSocketFactory.java +++ b/clc/modules/postgresql/src/main/java/com/eucalyptus/postgresql/PostgreSQLSSLSocketFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.postgresql; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/Period.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/Period.java index 58603bf6ecd..3f323b83e44 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/Period.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/Period.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportFormat.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportFormat.java index a260101ac92..e837191fe6d 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportFormat.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportFormat.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportGenerator.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportGenerator.java index 36551a2d235..3933491dc5a 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportGenerator.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportGenerator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AccountArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AccountArtEntity.java index edd9a2c0000..00a3e9eaf31 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AccountArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AccountArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AvailabilityZoneArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AvailabilityZoneArtEntity.java index b39fca07cda..b3adc676fa2 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AvailabilityZoneArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AvailabilityZoneArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/BucketUsageArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/BucketUsageArtEntity.java index b0bf56e8f4f..ad0c0fdf336 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/BucketUsageArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/BucketUsageArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ClusterArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ClusterArtEntity.java index c68da8fffaf..e2b459c90fd 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ClusterArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ClusterArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpArtEntity.java index 0d0c7579217..58b2bed5698 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpUsageArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpUsageArtEntity.java index cf041836f32..78cb97c1a6d 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpUsageArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpUsageArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceArtEntity.java index 54a8922248e..34c27c1fc50 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceUsageArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceUsageArtEntity.java index fcbd94677c0..6f5bf68de85 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceUsageArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceUsageArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ReportArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ReportArtEntity.java index 16f558ce6cf..90d90ec4991 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ReportArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ReportArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UsageTotalsArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UsageTotalsArtEntity.java index ad76e00dd13..5f5b7e88583 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UsageTotalsArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UsageTotalsArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UserArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UserArtEntity.java index 2a8af4cbfed..d5bfbaadd37 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UserArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UserArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeArtEntity.java index f87b022790f..b56dfe646da 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeSnapshotUsageArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeSnapshotUsageArtEntity.java index 6e03d14561a..a7b702f8e73 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeSnapshotUsageArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeSnapshotUsageArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeUsageArtEntity.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeUsageArtEntity.java index 29252c0918e..93285418250 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeUsageArtEntity.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeUsageArtEntity.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.entity; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/InstanceArtGenerator.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/InstanceArtGenerator.java index d0d1b168b9e..73113a0d2c1 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/InstanceArtGenerator.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/InstanceArtGenerator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.generator; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/S3ArtGenerator.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/S3ArtGenerator.java index 3a306b74a18..24b17a03889 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/S3ArtGenerator.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/S3ArtGenerator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.generator; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeArtGenerator.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeArtGenerator.java index e90e31ac916..c9ae9890c90 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeArtGenerator.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeArtGenerator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.generator; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeSnapshotArtGenerator.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeSnapshotArtGenerator.java index ad5fe69b3f4..994b1d73e3f 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeSnapshotArtGenerator.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeSnapshotArtGenerator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.generator; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/InstanceRenderer.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/InstanceRenderer.java index e518d59a7cf..c98042e1ba5 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/InstanceRenderer.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/InstanceRenderer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.renderer; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/Renderer.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/Renderer.java index 8280c23f70f..a9daf545665 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/Renderer.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/Renderer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.renderer; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/RendererFactory.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/RendererFactory.java index 2048d9494bc..323c5bc1128 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/RendererFactory.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/RendererFactory.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.renderer; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/S3Renderer.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/S3Renderer.java index cae40884858..2b909aa63ff 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/S3Renderer.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/S3Renderer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.renderer; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeRenderer.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeRenderer.java index 70c276bbab0..27016f6f9e2 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeRenderer.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeRenderer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.renderer; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeSnapshotRenderer.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeSnapshotRenderer.java index 6f8de821471..8f0e78a731c 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeSnapshotRenderer.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeSnapshotRenderer.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.renderer; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/document/HtmlDocument.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/document/HtmlDocument.java index ee035e9ba39..8024f74f329 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/document/HtmlDocument.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/document/HtmlDocument.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.renderer.document; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/AttachDurationCalculator.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/AttachDurationCalculator.java index c6f2a9a8c0e..d3d7f00115c 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/AttachDurationCalculator.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/AttachDurationCalculator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.util; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/DurationCalculator.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/DurationCalculator.java index 1fb39f111a1..89fc06d0ac7 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/DurationCalculator.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/DurationCalculator.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.util; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/StartEndTimes.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/StartEndTimes.java index 335e8bbcba5..2784e5b1550 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/StartEndTimes.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/StartEndTimes.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.art.util; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingComputeDomainModel.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingComputeDomainModel.java index 1e2c2616da7..9ed64a8b607 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingComputeDomainModel.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingComputeDomainModel.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.domain; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/SizeUnit.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/SizeUnit.java index 1dc9d4ead78..b7184b3569a 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/SizeUnit.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/SizeUnit.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.units; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/TimeUnit.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/TimeUnit.java index 82bef555ad3..0a226e1ad02 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/TimeUnit.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/TimeUnit.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.units; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/UnitUtil.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/UnitUtil.java index 256c1d65e88..b2b3e554f71 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/UnitUtil.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/UnitUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.units; diff --git a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/Units.java b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/Units.java index aa5125ecdf2..0bcb9d717df 100644 --- a/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/Units.java +++ b/clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/Units.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting.units; diff --git a/clc/modules/reporting/src/test/java/com/eucalyptus/reporting/CsvChecker.java b/clc/modules/reporting/src/test/java/com/eucalyptus/reporting/CsvChecker.java index 147c9f7a0fb..96cab5b0acb 100644 --- a/clc/modules/reporting/src/test/java/com/eucalyptus/reporting/CsvChecker.java +++ b/clc/modules/reporting/src/test/java/com/eucalyptus/reporting/CsvChecker.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.reporting; diff --git a/clc/modules/reporting/src/test/sh/within_error.bc b/clc/modules/reporting/src/test/sh/within_error.bc index 553f9bca197..57385c78be2 100644 --- a/clc/modules/reporting/src/test/sh/within_error.bc +++ b/clc/modules/reporting/src/test/sh/within_error.bc @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ define within(val, correctval, err) { diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CallBack.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CallBack.java index f22df349db1..32ca806300f 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CallBack.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CallBack.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CheckerTask.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CheckerTask.java index 06d7c960853..bca9e6a0447 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CheckerTask.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CheckerTask.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/ChunkedDataFile.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/ChunkedDataFile.java index 9bfd4632211..2a03a5c4215 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/ChunkedDataFile.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/ChunkedDataFile.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/ChunkedDataStream.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/ChunkedDataStream.java index c1ebb44f582..a3b5b87ba9b 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/ChunkedDataStream.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/ChunkedDataStream.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CompressedChunkedFile.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CompressedChunkedFile.java index 97773656483..0f8d8e19774 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CompressedChunkedFile.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/CompressedChunkedFile.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/DateFormatter.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/DateFormatter.java index 86d8c53eb1e..14bdd0eded8 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/DateFormatter.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/DateFormatter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileIO.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileIO.java index b8e7f13caa2..3d7c3aa8d0c 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileIO.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileIO.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common.fs; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileReader.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileReader.java index c433d391493..c6cc84cf8c7 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileReader.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileReader.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common.fs; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileWriter.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileWriter.java index f3d25efcc65..c67a45b800d 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileWriter.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/common/fs/FileWriter.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.common.fs; diff --git a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/msgs/BucketLogData.java b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/msgs/BucketLogData.java index 7f9ebf563d5..6bbafe47eb7 100644 --- a/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/msgs/BucketLogData.java +++ b/clc/modules/storage-common/src/main/java/com/eucalyptus/storage/msgs/BucketLogData.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.storage.msgs; diff --git a/clc/modules/troubleshooting/src/main/java/com/eucalyptus/bootstrap/TroubleshootingBootstrapper.java b/clc/modules/troubleshooting/src/main/java/com/eucalyptus/bootstrap/TroubleshootingBootstrapper.java index 16eac36fe35..6291773c7ef 100644 --- a/clc/modules/troubleshooting/src/main/java/com/eucalyptus/bootstrap/TroubleshootingBootstrapper.java +++ b/clc/modules/troubleshooting/src/main/java/com/eucalyptus/bootstrap/TroubleshootingBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.bootstrap; diff --git a/clc/modules/troubleshooting/src/main/java/com/eucalyptus/troubleshooting/TestFaultTrigger.java b/clc/modules/troubleshooting/src/main/java/com/eucalyptus/troubleshooting/TestFaultTrigger.java index a48794e9b80..5b787132d9c 100644 --- a/clc/modules/troubleshooting/src/main/java/com/eucalyptus/troubleshooting/TestFaultTrigger.java +++ b/clc/modules/troubleshooting/src/main/java/com/eucalyptus/troubleshooting/TestFaultTrigger.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.troubleshooting; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/WalrusBackend.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/WalrusBackend.java index d16a29fc428..55c87654cfb 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/WalrusBackend.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/WalrusBackend.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/WalrusConfiguration.groovy b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/WalrusConfiguration.groovy index 2d2d8c7a4d6..7297f1a927e 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/WalrusConfiguration.groovy +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/WalrusConfiguration.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/BucketInfo.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/BucketInfo.java index 00ae5dc78a5..a07517dec7f 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/BucketInfo.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/BucketInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.entities; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/DRBDInfo.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/DRBDInfo.java index 5c56cfc77b6..62d98b453c7 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/DRBDInfo.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/DRBDInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.entities; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/MetaDataInfo.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/MetaDataInfo.java index 2fb8826bdc7..4b925b077cf 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/MetaDataInfo.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/MetaDataInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.entities; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/ObjectInfo.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/ObjectInfo.java index 9a77908f72c..64e38fc2427 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/ObjectInfo.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/ObjectInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.entities; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/PartInfo.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/PartInfo.java index bfcd01b30d8..99edd69d2f7 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/PartInfo.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/PartInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.entities; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/WalrusInfo.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/WalrusInfo.java index ae6f0626b92..ffb1e12b296 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/WalrusInfo.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/entities/WalrusInfo.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.entities; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/AccessDeniedException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/AccessDeniedException.java index 21dae866232..7c252124c74 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/AccessDeniedException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/AccessDeniedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketAlreadyExistsException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketAlreadyExistsException.java index 9581a2fee3d..1a542da5e65 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketAlreadyExistsException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketAlreadyExistsException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketAlreadyOwnedByYouException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketAlreadyOwnedByYouException.java index 0373aa78bbd..c19b160ab5d 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketAlreadyOwnedByYouException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketAlreadyOwnedByYouException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketNotEmptyException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketNotEmptyException.java index 5f089e822f7..9a6394b82c1 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketNotEmptyException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/BucketNotEmptyException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/ContentMismatchException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/ContentMismatchException.java index 4ff8d4a07b3..a8642854c68 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/ContentMismatchException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/ContentMismatchException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/DecryptionFailedException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/DecryptionFailedException.java index ae68f83db31..3efc8376305 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/DecryptionFailedException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/DecryptionFailedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/EntityAlreadyExistsException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/EntityAlreadyExistsException.java index ade12e90c86..c55d66df0c4 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/EntityAlreadyExistsException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/EntityAlreadyExistsException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/EntityTooLargeException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/EntityTooLargeException.java index 365ae669572..1e94b8faa35 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/EntityTooLargeException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/EntityTooLargeException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/ImageAlreadyExistsException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/ImageAlreadyExistsException.java index de242d89f87..6825fc31665 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/ImageAlreadyExistsException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/ImageAlreadyExistsException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InlineDataTooLargeException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InlineDataTooLargeException.java index 07bd17f6867..75108f06238 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InlineDataTooLargeException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InlineDataTooLargeException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InternalErrorException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InternalErrorException.java index 702d345d9b4..3b5158a0bd9 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InternalErrorException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InternalErrorException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidArgumentException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidArgumentException.java index 04fd4482497..c7cf2af44c2 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidArgumentException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidArgumentException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidBucketNameException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidBucketNameException.java index 19689872f2b..4ca30736078 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidBucketNameException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidBucketNameException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidPartException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidPartException.java index c2b6d496cf0..990e5170b08 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidPartException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidPartException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidRangeException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidRangeException.java index a0c14c28939..e9c484021de 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidRangeException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidRangeException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidTargetBucketForLoggingException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidTargetBucketForLoggingException.java index 5a824785757..4f2ad19df48 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidTargetBucketForLoggingException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/InvalidTargetBucketForLoggingException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchBucketException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchBucketException.java index 62314bc104e..5f99da0c8d8 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchBucketException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchBucketException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchEntityException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchEntityException.java index a9345904bfe..299ff6954fa 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchEntityException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchEntityException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchLifecycleConfigurationException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchLifecycleConfigurationException.java index 2171af7186a..a3f7304ed27 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchLifecycleConfigurationException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchLifecycleConfigurationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchUploadException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchUploadException.java index 92f3067c63a..925407e19b2 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchUploadException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NoSuchUploadException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotAuthorizedException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotAuthorizedException.java index 9ac8e928ac3..6ca1ba586a2 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotAuthorizedException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotAuthorizedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotImplementedException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotImplementedException.java index 03fe06e1a6c..ae03fdea661 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotImplementedException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotImplementedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotModifiedException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotModifiedException.java index 398717f9d9d..b339f830fe1 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotModifiedException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotModifiedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotReadyException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotReadyException.java index c7c2ab22354..3499d821993 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotReadyException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/NotReadyException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/PreconditionFailedException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/PreconditionFailedException.java index cce2d9a5bda..f4b06e124fc 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/PreconditionFailedException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/PreconditionFailedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/TooManyBucketsException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/TooManyBucketsException.java index 95a8b314abd..e63fc68eefc 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/TooManyBucketsException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/TooManyBucketsException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/WalrusException.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/WalrusException.java index 8df887e5165..a3ffa2bd3c4 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/WalrusException.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/exceptions/WalrusException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.exceptions; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/Walrus.groovy b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/Walrus.groovy index ccf8aa4a89f..1380aafdd32 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/Walrus.groovy +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/Walrus.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusConfigurationMessages.groovy b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusConfigurationMessages.groovy index 04ac85c1f1e..67d1b8e4bac 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusConfigurationMessages.groovy +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusConfigurationMessages.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ @GroovyAddClassUUID diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataMessage.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataMessage.java index b71458eb08e..843754bb884 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataMessage.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataMessage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.msgs; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataMessenger.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataMessenger.java index 2429ec19557..7981d3bd90c 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataMessenger.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataMessenger.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.msgs; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataQueue.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataQueue.java index b412260a9f7..6dd84dd0bcb 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataQueue.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusDataQueue.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.msgs; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusMonitor.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusMonitor.java index 26dfcceecd3..f4d1ce3ac53 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusMonitor.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/msgs/WalrusMonitor.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.msgs; diff --git a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/util/WalrusProperties.java b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/util/WalrusProperties.java index 61fe7a222a9..63878e632c6 100644 --- a/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/util/WalrusProperties.java +++ b/clc/modules/walrus-common/src/main/java/com/eucalyptus/walrus/util/WalrusProperties.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.util; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/StorageManager.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/StorageManager.java index 50948f99a64..5961694d14e 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/StorageManager.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/StorageManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/WalrusControl.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/WalrusControl.java index 8eb1de32042..a74ad0c0d9a 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/WalrusControl.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/WalrusControl.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/WalrusFSManager.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/WalrusFSManager.java index 0558fc4a544..101bcda2c66 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/WalrusFSManager.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/WalrusFSManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/auth/WalrusLoginModule.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/auth/WalrusLoginModule.java index 1fc8d35e067..9a9298682c3 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/auth/WalrusLoginModule.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/auth/WalrusLoginModule.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.auth; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/auth/WalrusWrappedCredentials.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/auth/WalrusWrappedCredentials.java index 7a46760fcb9..919756e8898 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/auth/WalrusWrappedCredentials.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/auth/WalrusWrappedCredentials.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.auth; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/bootstrap/WalrusBootstrapper.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/bootstrap/WalrusBootstrapper.java index 058b20e7fff..655f56a59da 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/bootstrap/WalrusBootstrapper.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/bootstrap/WalrusBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.bootstrap; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/config/WalrusBuilder.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/config/WalrusBuilder.java index 477c8bc5b75..64d550d7e44 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/config/WalrusBuilder.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/config/WalrusBuilder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.config; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusAuthenticationHandler.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusAuthenticationHandler.java index d94189e470b..2ae3947ffb6 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusAuthenticationHandler.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusAuthenticationHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.pipeline; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusOutboundHandler.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusOutboundHandler.java index 07a35607527..1151e9b6bc3 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusOutboundHandler.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusOutboundHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.pipeline; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusRESTBinding.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusRESTBinding.java index 56474030ec9..4ff9a817757 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusRESTBinding.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusRESTBinding.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.pipeline; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusRESTPipeline.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusRESTPipeline.java index 20929ccf6a5..c8697201295 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusRESTPipeline.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/WalrusRESTPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.pipeline; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusOutboundStage.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusOutboundStage.java index 67d216adbf8..b8c5d63a2a3 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusOutboundStage.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusOutboundStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.pipeline.stages; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusRESTBindingStage.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusRESTBindingStage.java index a476bf6d640..36ab224a3c6 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusRESTBindingStage.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusRESTBindingStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.pipeline.stages; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusUserAuthenticationStage.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusUserAuthenticationStage.java index 6d88be8ba5f..e8aee55f4fa 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusUserAuthenticationStage.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/pipeline/stages/WalrusUserAuthenticationStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.pipeline.stages; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/storage/DRBDStorageManager.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/storage/DRBDStorageManager.java index 465c3b295da..106732fa69c 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/storage/DRBDStorageManager.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/storage/DRBDStorageManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.storage; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/storage/FileSystemStorageManager.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/storage/FileSystemStorageManager.java index 5fe9e20d9aa..e4ed8fbfa1b 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/storage/FileSystemStorageManager.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/storage/FileSystemStorageManager.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.storage; diff --git a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/util/WalrusUtil.java b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/util/WalrusUtil.java index cc9333c53f8..ac00caecde3 100644 --- a/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/util/WalrusUtil.java +++ b/clc/modules/walrus/src/main/java/com/eucalyptus/walrus/util/WalrusUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.util; diff --git a/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/BukkitTest.java b/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/BukkitTest.java index 43ef6164063..4b9acfc280a 100644 --- a/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/BukkitTest.java +++ b/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/BukkitTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.tests; diff --git a/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/ObjectTest.java b/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/ObjectTest.java index d342527aa63..7c4c2d3b7f7 100644 --- a/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/ObjectTest.java +++ b/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/ObjectTest.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.tests; diff --git a/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/WalrusBucketTests.java b/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/WalrusBucketTests.java index 77f215396aa..2bf246896c1 100644 --- a/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/WalrusBucketTests.java +++ b/clc/modules/walrus/src/test/java/com/eucalyptus/walrus/tests/WalrusBucketTests.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.walrus.tests; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/DeferredPropertiesBootstrapper.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/DeferredPropertiesBootstrapper.java index 1649031c56d..c7ff85a4a95 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/DeferredPropertiesBootstrapper.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/DeferredPropertiesBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/InvalidOperationException.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/InvalidOperationException.java index 481df62cf0e..45a43e1d35a 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/InvalidOperationException.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/InvalidOperationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/MethodNotAllowedException.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/MethodNotAllowedException.java index 91e164b3f67..488af202cc5 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/MethodNotAllowedException.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/MethodNotAllowedException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/RemoteConfigurationException.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/RemoteConfigurationException.java index 9843d2287aa..0c1f3076847 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/RemoteConfigurationException.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/RemoteConfigurationException.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java index a784fa60c7c..1c6b8bb04a1 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/InternalClientPipeline.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/InternalClientPipeline.java index 71da69c9857..eac0535f043 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/InternalClientPipeline.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/InternalClientPipeline.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.client.pipeline; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/BrokerBindingHandler.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/BrokerBindingHandler.java index e33f6c44754..db8b6582bae 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/BrokerBindingHandler.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/BrokerBindingHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ChannelStateMonitor.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ChannelStateMonitor.java index a6e2cdb48ae..e334aebb19b 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ChannelStateMonitor.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ChannelStateMonitor.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/NioHttpResponseDecoder.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/NioHttpResponseDecoder.java index b70fe561eba..cd968f4bf97 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/NioHttpResponseDecoder.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/NioHttpResponseDecoder.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/POSTRequestContext.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/POSTRequestContext.java index 78d073d1ef9..29f2dd9672b 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/POSTRequestContext.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/POSTRequestContext.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/TestHandler.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/TestHandler.java index d996fdb5d1a..5b87f0b0118 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/TestHandler.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/TestHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/BrokerWsSecHandler.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/BrokerWsSecHandler.java index a5e13b2f424..da8004e9751 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/BrokerWsSecHandler.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/BrokerWsSecHandler.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2015 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2015 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.handlers.wssecurity; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/HmacUserAuthenticationStage.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/HmacUserAuthenticationStage.java index 93a913422ef..f78f3e5703e 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/HmacUserAuthenticationStage.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/HmacUserAuthenticationStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.stages; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/SoapUserAuthenticationStage.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/SoapUserAuthenticationStage.java index 5c773360cdc..f4b8c413900 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/SoapUserAuthenticationStage.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/SoapUserAuthenticationStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.stages; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/UnrollableStage.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/UnrollableStage.java index bf6012e67cc..195a19e7103 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/UnrollableStage.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/UnrollableStage.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.stages; diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java index 2b9854003ce..aac818a9033 100644 --- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java +++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ package com.eucalyptus.ws.util; diff --git a/cluster/CCclient.c b/cluster/CCclient.c index 9648fe57466..5f274aa0e5d 100644 --- a/cluster/CCclient.c +++ b/cluster/CCclient.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/cluster/cc-client-marshal-adb.c b/cluster/cc-client-marshal-adb.c index f1a53700232..9de76c31ffa 100644 --- a/cluster/cc-client-marshal-adb.c +++ b/cluster/cc-client-marshal-adb.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/cluster/cc-client-marshal.h b/cluster/cc-client-marshal.h index a395627415d..d5544cf18e9 100644 --- a/cluster/cc-client-marshal.h +++ b/cluster/cc-client-marshal.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_CC_CLIENT_MARSHAL_H_ diff --git a/cluster/config-cc.h b/cluster/config-cc.h index 04013f95451..f5bbdb305ad 100644 --- a/cluster/config-cc.h +++ b/cluster/config-cc.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef INCLUDE_CONFIG_CC_H diff --git a/cluster/handlers-state.c b/cluster/handlers-state.c index 64de26e1ffe..4d1b9cc850e 100644 --- a/cluster/handlers-state.c +++ b/cluster/handlers-state.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/cluster/handlers-state.h b/cluster/handlers-state.h index f7392b3e9c2..6f224018ef1 100644 --- a/cluster/handlers-state.h +++ b/cluster/handlers-state.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_HANDLERS_STATE_H_ diff --git a/cluster/handlers.c b/cluster/handlers.c index e6e1bf33c4c..f76680a1c13 100644 --- a/cluster/handlers.c +++ b/cluster/handlers.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/cluster/handlers.h b/cluster/handlers.h index 35c6fd90c5a..285fb3be651 100644 --- a/cluster/handlers.h +++ b/cluster/handlers.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_CC_HANDLERS_H_ diff --git a/cluster/server-marshal-state.c b/cluster/server-marshal-state.c index f6ab131ce8e..c96f4346d3f 100644 --- a/cluster/server-marshal-state.c +++ b/cluster/server-marshal-state.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/cluster/server-marshal-state.h b/cluster/server-marshal-state.h index 91bc78f716c..654f2a54d34 100644 --- a/cluster/server-marshal-state.h +++ b/cluster/server-marshal-state.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_SERVER_MARSHAL_STATE_H_ diff --git a/cluster/server-marshal.c b/cluster/server-marshal.c index 1591308c8e9..e79ac9e9ad3 100644 --- a/cluster/server-marshal.c +++ b/cluster/server-marshal.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/cluster/server-marshal.h b/cluster/server-marshal.h index f698f7643d2..09e5a0ed584 100644 --- a/cluster/server-marshal.h +++ b/cluster/server-marshal.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_SERVER_MARSHAL_H_ diff --git a/cluster/shutdownCC.c b/cluster/shutdownCC.c index 801588602d2..97fcaaa243a 100644 --- a/cluster/shutdownCC.c +++ b/cluster/shutdownCC.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/devel/fsm-pathTo.groovy b/devel/fsm-pathTo.groovy index db687a2e08b..642f9b4a19b 100644 --- a/devel/fsm-pathTo.groovy +++ b/devel/fsm-pathTo.groovy @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ import com.eucalyptus.util.fsm.TransitionHandler; diff --git a/doxygen/extra_pages/changelog.txt b/doxygen/extra_pages/changelog.txt index 284bb38931a..64adb889822 100644 --- a/doxygen/extra_pages/changelog.txt +++ b/doxygen/extra_pages/changelog.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/doxygen/extra_pages/cluster_project.txt b/doxygen/extra_pages/cluster_project.txt index a5be89241bc..785303667e2 100644 --- a/doxygen/extra_pages/cluster_project.txt +++ b/doxygen/extra_pages/cluster_project.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/doxygen/extra_pages/doxygen.txt b/doxygen/extra_pages/doxygen.txt index d4c390c518d..2d8d091afdd 100644 --- a/doxygen/extra_pages/doxygen.txt +++ b/doxygen/extra_pages/doxygen.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/doxygen/extra_pages/eucanetd_project.txt b/doxygen/extra_pages/eucanetd_project.txt index 0f4f28686d1..88e187e5300 100644 --- a/doxygen/extra_pages/eucanetd_project.txt +++ b/doxygen/extra_pages/eucanetd_project.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/doxygen/extra_pages/install.txt b/doxygen/extra_pages/install.txt index 43a5f902c94..ab222908ca1 100644 --- a/doxygen/extra_pages/install.txt +++ b/doxygen/extra_pages/install.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/doxygen/extra_pages/license.txt b/doxygen/extra_pages/license.txt index c90b3058200..7a6e17c859a 100644 --- a/doxygen/extra_pages/license.txt +++ b/doxygen/extra_pages/license.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/doxygen/extra_pages/node_project.txt b/doxygen/extra_pages/node_project.txt index b35c059958c..1c86afebde3 100644 --- a/doxygen/extra_pages/node_project.txt +++ b/doxygen/extra_pages/node_project.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/doxygen/extra_pages/readme.txt b/doxygen/extra_pages/readme.txt index 08eaa916119..e66204d70fb 100644 --- a/doxygen/extra_pages/readme.txt +++ b/doxygen/extra_pages/readme.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/doxygen/extra_pages/vmware_broker_project.txt b/doxygen/extra_pages/vmware_broker_project.txt index fce7ca83110..17db53cda10 100644 --- a/doxygen/extra_pages/vmware_broker_project.txt +++ b/doxygen/extra_pages/vmware_broker_project.txt @@ -1,61 +1,41 @@ -/****************************************************************************** - * Copyright (c) 2009 Eucalyptus Systems, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, only version 3 of the License. - * - * This file is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Please contact Eucalyptus Systems, Inc., 130 Castilian - * Dr., Goleta, CA 93101 USA or visit - * if you need additional information or have any questions. - * - * This file may incorporate work covered under the following copyright and - * permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * - * Redistribution and use of this software in source and binary forms, with - * or without modification, are permitted provided that the following - * conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF - * THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE - * LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS - * SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA - * BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN - * THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT - * OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR - * WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH - * ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: diff --git a/gatherlog/GLclient.c b/gatherlog/GLclient.c index a867cc5b7d1..85b43ae26f7 100644 --- a/gatherlog/GLclient.c +++ b/gatherlog/GLclient.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/gatherlog/gl-client-marshal-adb.c b/gatherlog/gl-client-marshal-adb.c index 195c68d7f05..b343aecd11f 100644 --- a/gatherlog/gl-client-marshal-adb.c +++ b/gatherlog/gl-client-marshal-adb.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/gatherlog/gl-client-marshal.h b/gatherlog/gl-client-marshal.h index 8e667a6024b..de568722111 100644 --- a/gatherlog/gl-client-marshal.h +++ b/gatherlog/gl-client-marshal.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_GLCLIENT_H_ diff --git a/gatherlog/handlers.c b/gatherlog/handlers.c index abea0e39889..c85dd9732bb 100644 --- a/gatherlog/handlers.c +++ b/gatherlog/handlers.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/gatherlog/handlers.h b/gatherlog/handlers.h index e80e72a8de4..d8674173549 100644 --- a/gatherlog/handlers.h +++ b/gatherlog/handlers.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_HANDLERS_H_ diff --git a/gatherlog/server-marshal.c b/gatherlog/server-marshal.c index c5a1c129c4e..7a8031ec46d 100644 --- a/gatherlog/server-marshal.c +++ b/gatherlog/server-marshal.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/gatherlog/server-marshal.h b/gatherlog/server-marshal.h index c194c0f077d..79515d89f3b 100644 --- a/gatherlog/server-marshal.h +++ b/gatherlog/server-marshal.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _SERVER_MARSHAL_H_ diff --git a/node/NCclient.c b/node/NCclient.c index 0f7557deb2d..99b52caf23a 100644 --- a/node/NCclient.c +++ b/node/NCclient.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/client-marshal-adb.c b/node/client-marshal-adb.c index 1b543653d35..00fc188627b 100644 --- a/node/client-marshal-adb.c +++ b/node/client-marshal-adb.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/client-marshal-fake.c b/node/client-marshal-fake.c index d563c2f59c0..c8305e9ca74 100644 --- a/node/client-marshal-fake.c +++ b/node/client-marshal-fake.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/client-marshal-local.c b/node/client-marshal-local.c index d8b994e9b2f..79d8a3195db 100644 --- a/node/client-marshal-local.c +++ b/node/client-marshal-local.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/client-marshal.h b/node/client-marshal.h index 396c5ff8075..71040c868bf 100644 --- a/node/client-marshal.h +++ b/node/client-marshal.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/handlers.h b/node/handlers.h index 3b8fad7e990..811bc52f5a2 100644 --- a/node/handlers.h +++ b/node/handlers.h @@ -1,67 +1,44 @@ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: -/******************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. +/************************************************************************* + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ //! //! @file node/handlers.h diff --git a/node/handlers_default.c b/node/handlers_default.c index 528354e6d10..15198d97e19 100644 --- a/node/handlers_default.c +++ b/node/handlers_default.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/handlers_kvm.c b/node/handlers_kvm.c index eb7979cee97..02154c07921 100644 --- a/node/handlers_kvm.c +++ b/node/handlers_kvm.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/handlers_xen.c b/node/handlers_xen.c index 0ff9854da16..57d6bc58823 100644 --- a/node/handlers_xen.c +++ b/node/handlers_xen.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/hooks.c b/node/hooks.c index 154bc29524b..3edbc6055e6 100644 --- a/node/hooks.c +++ b/node/hooks.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/hooks.h b/node/hooks.h index f3451bc749a..1a9c7225d6a 100644 --- a/node/hooks.h +++ b/node/hooks.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/libvirt_nag.c b/node/libvirt_nag.c index 444191dc3c5..8eb5b471d49 100644 --- a/node/libvirt_nag.c +++ b/node/libvirt_nag.c @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/libvirt_tortura.c b/node/libvirt_tortura.c index a2a11bfd289..b2ece694c31 100644 --- a/node/libvirt_tortura.c +++ b/node/libvirt_tortura.c @@ -1,63 +1,40 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ // -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- diff --git a/node/server-marshal.c b/node/server-marshal.c index d707e2e4992..96c451e9f3c 100644 --- a/node/server-marshal.c +++ b/node/server-marshal.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/server-marshal.h b/node/server-marshal.h index bf065672410..6fa2b14b038 100644 --- a/node/server-marshal.h +++ b/node/server-marshal.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/test.c b/node/test.c index 175a662d659..27da59fd84e 100644 --- a/node/test.c +++ b/node/test.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/test_nc.c b/node/test_nc.c index 80ce73fd775..0a5dbf3e363 100644 --- a/node/test_nc.c +++ b/node/test_nc.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and te following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/xml.c b/node/xml.c index 3fe81246086..f8f81e15862 100644 --- a/node/xml.c +++ b/node/xml.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/node/xml.h b/node/xml.h index 8ad2ecf0106..89496649c61 100644 --- a/node/xml.h +++ b/node/xml.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/OSGclient.c b/storage/OSGclient.c index 647e1992810..987798d5bdd 100644 --- a/storage/OSGclient.c +++ b/storage/OSGclient.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/SCclient.c b/storage/SCclient.c index 4ee329c0a57..d01064c1325 100644 --- a/storage/SCclient.c +++ b/storage/SCclient.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/blobstore.c b/storage/blobstore.c index 1fa89e15f36..e55ad80f556 100644 --- a/storage/blobstore.c +++ b/storage/blobstore.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/blobstore.h b/storage/blobstore.h index 78f65c8c952..def4f9c7ee0 100644 --- a/storage/blobstore.h +++ b/storage/blobstore.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_BLOBSTORE_H_ diff --git a/storage/diskutil.c b/storage/diskutil.c index 162af487170..6384708cd3e 100644 --- a/storage/diskutil.c +++ b/storage/diskutil.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/diskutil.h b/storage/diskutil.h index 09bb6120c24..48e65544167 100644 --- a/storage/diskutil.h +++ b/storage/diskutil.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_DISKUTIL_H_ diff --git a/storage/ebs_utils.c b/storage/ebs_utils.c index 4540488ad58..f49d4b04587 100644 --- a/storage/ebs_utils.c +++ b/storage/ebs_utils.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/ebs_utils.h b/storage/ebs_utils.h index f9297ffbb40..44ba6786f67 100644 --- a/storage/ebs_utils.h +++ b/storage/ebs_utils.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_EBS_UTILS_H_ diff --git a/storage/http.c b/storage/http.c index 4fc7f1118ee..f182c49b2f5 100644 --- a/storage/http.c +++ b/storage/http.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/http.h b/storage/http.h index a8a0acdb768..8d40541fb40 100644 --- a/storage/http.h +++ b/storage/http.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_HTTP_H_ diff --git a/storage/iscsi.c b/storage/iscsi.c index 077468182be..4d15f63c7d8 100644 --- a/storage/iscsi.c +++ b/storage/iscsi.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/iscsi.h b/storage/iscsi.h index 5b78ec9c069..8ed7c2031d9 100644 --- a/storage/iscsi.h +++ b/storage/iscsi.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_ISCSI_H_ diff --git a/storage/map.c b/storage/map.c index b695d37bb18..4efb2e69ba3 100644 --- a/storage/map.c +++ b/storage/map.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/map.h b/storage/map.h index 6cf6e917f72..314869c754b 100644 --- a/storage/map.h +++ b/storage/map.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_MAP_H_ diff --git a/storage/objectstorage.c b/storage/objectstorage.c index f3ddc923358..a87acbc5da5 100644 --- a/storage/objectstorage.c +++ b/storage/objectstorage.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/objectstorage.h b/storage/objectstorage.h index 5b99a2ed011..49d4bee1262 100644 --- a/storage/objectstorage.h +++ b/storage/objectstorage.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_OBJECT_STORAGE_H_ diff --git a/storage/sc-client-marshal-adb.c b/storage/sc-client-marshal-adb.c index c7c0a3b08ca..d9d9c75d3c0 100644 --- a/storage/sc-client-marshal-adb.c +++ b/storage/sc-client-marshal-adb.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/sc-client-marshal.h b/storage/sc-client-marshal.h index 6c95de4d71b..6d437b67140 100644 --- a/storage/sc-client-marshal.h +++ b/storage/sc-client-marshal.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/storage-controller.c b/storage/storage-controller.c index fee16248d40..e8b02673043 100644 --- a/storage/storage-controller.c +++ b/storage/storage-controller.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/storage-controller.h b/storage/storage-controller.h index 31cd8c278b1..f45a01b3949 100644 --- a/storage/storage-controller.h +++ b/storage/storage-controller.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_STORAGE_CONTROLLER_H_ diff --git a/storage/storage-windows.c b/storage/storage-windows.c index 65f083108c3..5c871a23652 100644 --- a/storage/storage-windows.c +++ b/storage/storage-windows.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/storage-windows.h b/storage/storage-windows.h index fd94d4720c3..0d8075802ab 100644 --- a/storage/storage-windows.h +++ b/storage/storage-windows.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_STORAGE_WINDOWS_H_ diff --git a/storage/vbr.c b/storage/vbr.c index 569698d1bd1..9b6b3ffe12b 100644 --- a/storage/vbr.c +++ b/storage/vbr.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/storage/vbr.h b/storage/vbr.h index 6a19c4c2038..f661e1ed793 100644 --- a/storage/vbr.h +++ b/storage/vbr.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_VBR_H_ diff --git a/tools/template.c b/tools/template.c index f5774baff73..ad4bd51e951 100644 --- a/tools/template.c +++ b/tools/template.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/tools/template.h b/tools/template.h index fd154514365..ab2cfa74332 100644 --- a/tools/template.h +++ b/tools/template.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_TEMPLATE_H_ diff --git a/util/adb-helpers.h b/util/adb-helpers.h index bb4e29752dd..971a9af8da1 100644 --- a/util/adb-helpers.h +++ b/util/adb-helpers.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/adb-service-helpers.h b/util/adb-service-helpers.h index 4c21198f14e..569a30a15f1 100644 --- a/util/adb-service-helpers.h +++ b/util/adb-service-helpers.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/atomic_file.c b/util/atomic_file.c index b17dee1e2d8..f75fdbad975 100644 --- a/util/atomic_file.c +++ b/util/atomic_file.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/atomic_file.h b/util/atomic_file.h index 0486388e70a..353fc0ad710 100644 --- a/util/atomic_file.h +++ b/util/atomic_file.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_ATOMIC_FILE_H_ diff --git a/util/config.c b/util/config.c index d6b80c9243b..be3b600951c 100644 --- a/util/config.c +++ b/util/config.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/config.h b/util/config.h index d212f0160bd..0b684d9d1a3 100644 --- a/util/config.h +++ b/util/config.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/data.c b/util/data.c index c80e2911b1e..e4d83e2ce2f 100644 --- a/util/data.c +++ b/util/data.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/data.h b/util/data.h index 30be600917a..c6a8c3e6621 100644 --- a/util/data.h +++ b/util/data.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/euca_auth.c b/util/euca_auth.c index 82286b81145..f44a1c43b13 100644 --- a/util/euca_auth.c +++ b/util/euca_auth.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/euca_auth.h b/util/euca_auth.h index 1887279b0d9..b15d823a8cd 100644 --- a/util/euca_auth.h +++ b/util/euca_auth.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_EUCA_AUTH_H_ diff --git a/util/euca_axis.c b/util/euca_axis.c index e28a11bc830..f991c0f3389 100644 --- a/util/euca_axis.c +++ b/util/euca_axis.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ /* BRIEF EXAMPLE MSG: diff --git a/util/euca_axis.h b/util/euca_axis.h index 92ab9af0b14..8692e99d6ee 100644 --- a/util/euca_axis.h +++ b/util/euca_axis.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_EUCA_AXIS_H_ diff --git a/util/euca_file.c b/util/euca_file.c index 758878a1ae4..e4f7124f3f4 100644 --- a/util/euca_file.c +++ b/util/euca_file.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/euca_file.h b/util/euca_file.h index d43954a2da8..9f85016242d 100644 --- a/util/euca_file.h +++ b/util/euca_file.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_EUCA_FILE_H_ diff --git a/util/euca_network.c b/util/euca_network.c index 2fc82266eb3..46c5ccc4d61 100644 --- a/util/euca_network.c +++ b/util/euca_network.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/euca_network.h b/util/euca_network.h index 0570ef45961..5a119554515 100644 --- a/util/euca_network.h +++ b/util/euca_network.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_EUCA_NETWORK_H_ diff --git a/util/euca_rootwrap.c b/util/euca_rootwrap.c index af278a56b1a..32d82e90278 100644 --- a/util/euca_rootwrap.c +++ b/util/euca_rootwrap.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/euca_string.c b/util/euca_string.c index 9c17dcedc7d..6f594a9dcf2 100644 --- a/util/euca_string.c +++ b/util/euca_string.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/euca_string.h b/util/euca_string.h index a48bb7fe058..30d9de9f1e9 100644 --- a/util/euca_string.h +++ b/util/euca_string.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_EUCA_STRING_H_ diff --git a/util/euca_system.c b/util/euca_system.c index 4e9c363d3e2..fa90d32928b 100644 --- a/util/euca_system.c +++ b/util/euca_system.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/euca_system.h b/util/euca_system.h index b13939b7345..c5e6c988354 100644 --- a/util/euca_system.h +++ b/util/euca_system.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_EUCA_SYSTEM_H_ diff --git a/util/eucalyptus-config.h.in b/util/eucalyptus-config.h.in index d4d1716c83d..c1589296dcd 100644 --- a/util/eucalyptus-config.h.in +++ b/util/eucalyptus-config.h.in @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_EUCALYPTUS_CONFIG_H_ diff --git a/util/fault.c b/util/fault.c index 3c96821bb72..16875699a2d 100644 --- a/util/fault.c +++ b/util/fault.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/fault.h b/util/fault.h index 2ca49bb5ea1..04d8cc50195 100644 --- a/util/fault.h +++ b/util/fault.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_FAULT_H_ diff --git a/util/hash.c b/util/hash.c index 5ea0e29a02a..5bbc8829c84 100644 --- a/util/hash.c +++ b/util/hash.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/hash.h b/util/hash.h index 8e77296e8a6..8f6063eda6d 100644 --- a/util/hash.h +++ b/util/hash.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_HASH_H_ diff --git a/util/instance33.h b/util/instance33.h index d2293f90cbc..ad70248ae8b 100644 --- a/util/instance33.h +++ b/util/instance33.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/ipc.c b/util/ipc.c index 4f73d25b75d..9a9b1a13fd9 100644 --- a/util/ipc.c +++ b/util/ipc.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/ipc.h b/util/ipc.h index 4a9645f0211..6727d8bec78 100644 --- a/util/ipc.h +++ b/util/ipc.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_IPC_H_ diff --git a/util/log.c b/util/log.c index 53012f094d3..21667792556 100644 --- a/util/log.c +++ b/util/log.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/log.h b/util/log.h index d12619b6a56..b599e63f13a 100644 --- a/util/log.h +++ b/util/log.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_LOG_H_ diff --git a/util/misc.h b/util/misc.h index 08d428eebde..97834477ccc 100644 --- a/util/misc.h +++ b/util/misc.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2013 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2013 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_MISC_H_ diff --git a/util/sensor.c b/util/sensor.c index e5cbaa8a6d2..cb538f47508 100644 --- a/util/sensor.c +++ b/util/sensor.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/sensor.h b/util/sensor.h index 5e6dec3313e..74f6a256c02 100644 --- a/util/sensor.h +++ b/util/sensor.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_SENSOR_H_ diff --git a/util/sequence_executor.c b/util/sequence_executor.c index 53a4d1e783e..17418783aac 100644 --- a/util/sequence_executor.c +++ b/util/sequence_executor.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/sequence_executor.h b/util/sequence_executor.h index 579bec5bbc9..7d73a21cf3c 100644 --- a/util/sequence_executor.h +++ b/util/sequence_executor.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_SEQUENCE_EXECUTOR_H_ diff --git a/util/stats/fs_emitter.c b/util/stats/fs_emitter.c index f1011b734f6..c88bf276d9a 100644 --- a/util/stats/fs_emitter.c +++ b/util/stats/fs_emitter.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/stats/fs_emitter.h b/util/stats/fs_emitter.h index 85db583b575..cb40739d779 100644 --- a/util/stats/fs_emitter.h +++ b/util/stats/fs_emitter.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_UTIL_STATS_FSEMITTER_H_ diff --git a/util/stats/message_sensor.c b/util/stats/message_sensor.c index 7e8e4a9c1d1..d273461f6ad 100644 --- a/util/stats/message_sensor.c +++ b/util/stats/message_sensor.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/stats/message_sensor.h b/util/stats/message_sensor.h index 3bf90d9d3c8..234a70ed118 100644 --- a/util/stats/message_sensor.h +++ b/util/stats/message_sensor.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_UTIL_STATS_MESSAGE_SENSOR_H_ diff --git a/util/stats/message_stats.c b/util/stats/message_stats.c index ca22559652e..6a6652c5d6f 100644 --- a/util/stats/message_stats.c +++ b/util/stats/message_stats.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/stats/message_stats.h b/util/stats/message_stats.h index 8f45a7dd8f9..810c7f1d34b 100644 --- a/util/stats/message_stats.h +++ b/util/stats/message_stats.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_UTIL_STATS_MESSAGE_STATS_H_ diff --git a/util/stats/sensor_common.c b/util/stats/sensor_common.c index c6b9cc362d9..de917388943 100644 --- a/util/stats/sensor_common.c +++ b/util/stats/sensor_common.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/stats/sensor_common.h b/util/stats/sensor_common.h index 5b82f8ee8db..0cfd8e4724d 100644 --- a/util/stats/sensor_common.h +++ b/util/stats/sensor_common.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_UTIL_STATS_SENSOR_COMMON_H_ diff --git a/util/stats/service_sensor.c b/util/stats/service_sensor.c index 8437e87a857..63d173bf145 100644 --- a/util/stats/service_sensor.c +++ b/util/stats/service_sensor.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/stats/service_sensor.h b/util/stats/service_sensor.h index b7a6382cf35..098d1ae65c2 100644 --- a/util/stats/service_sensor.h +++ b/util/stats/service_sensor.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_UTIL_STATS_SERVICE_SENSOR_H_ diff --git a/util/stats/stats.c b/util/stats/stats.c index 2854fd4bb8c..c7daf3295fa 100644 --- a/util/stats/stats.c +++ b/util/stats/stats.c @@ -2,66 +2,43 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* -* Copyright 2009-2012 Eucalyptus Systems, Inc. -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; version 3 of the License. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see http://www.gnu.org/licenses/. -* -* Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta -* CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need -* additional information or have any questions. -* -* This file may incorporate work covered under the following copyright -* and permission notice: -* -* Software License Agreement (BSD License) -* -* Copyright (c) 2008, Regents of the University of California -* All rights reserved. -* -* Redistribution and use of this software in source and binary forms, -* with or without modification, are permitted provided that the -* following conditions are met: -* -* Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer -* in the documentation and/or other materials provided with the -* distribution. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -* POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE -* THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, -* COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, -* AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING -* IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, -* SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, -* WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, -* REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO -* IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT -* NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. -************************************************************************/ + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP + * + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + ************************************************************************/ //! //! @file util/stats/stats.c diff --git a/util/stats/stats.h b/util/stats/stats.h index 72273a55d1a..fe48f7020a5 100644 --- a/util/stats/stats.h +++ b/util/stats/stats.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_UTIL_STATS_STATS_H_ diff --git a/util/template.c b/util/template.c index f5774baff73..ad4bd51e951 100644 --- a/util/template.c +++ b/util/template.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/template.h b/util/template.h index fd154514365..ab2cfa74332 100644 --- a/util/template.h +++ b/util/template.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_TEMPLATE_H_ diff --git a/util/test.c b/util/test.c index 6c450b25bd5..5598eb7fe66 100644 --- a/util/test.c +++ b/util/test.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/utf8.c b/util/utf8.c index 8386ed9fb2e..726a3456104 100644 --- a/util/utf8.c +++ b/util/utf8.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/utf8.h b/util/utf8.h index 8d0fa381a87..ae92e483e11 100644 --- a/util/utf8.h +++ b/util/utf8.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_UTF8_H_ diff --git a/util/wc.c b/util/wc.c index 8738f9e0f41..6f0268f2046 100644 --- a/util/wc.c +++ b/util/wc.c @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ //! diff --git a/util/wc.h b/util/wc.h index acd0bc32cbf..789b29b0c1a 100644 --- a/util/wc.h +++ b/util/wc.h @@ -2,65 +2,42 @@ // vim: set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software in source and binary forms, - * with or without modification, are permitted provided that the - * following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. ************************************************************************/ #ifndef _INCLUDE_WC_H_