incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [9/60] [abbrv] git commit: more license header cleanups
Date Thu, 27 Sep 2012 12:23:45 GMT
more license header cleanups


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

Branch: refs/heads/regions
Commit: 5c3a8cd490644fca4b1cd50a9da67e1dc6229ba6
Parents: c0d5f86
Author: David Nalley <david@gnsa.us>
Authored: Wed Jul 4 21:41:50 2012 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Wed Jul 4 21:41:50 2012 -0400

----------------------------------------------------------------------
 .../bridge/auth/ec2/AuthenticationHandler.java     |   15 -----------
 .../bridge/auth/ec2/AuthenticationModule.java      |   15 -----------
 .../bridge/auth/s3/AuthenticationHandler.java      |   15 -----------
 .../cloud/bridge/auth/s3/AuthenticationModule.java |   15 -----------
 .../com/cloud/bridge/io/FileRangeDataSource.java   |   15 -----------
 .../com/cloud/bridge/io/FileRangeInputStream.java  |   15 -----------
 .../cloud/bridge/io/MultiPartDimeInputStream.java  |   15 -----------
 .../cloud/bridge/io/S3FileSystemBucketAdapter.java |   15 -----------
 .../bridge/lifecycle/ServiceEngineLifecycle.java   |   15 -----------
 awsapi/src/com/cloud/bridge/model/MHost.java       |   15 -----------
 awsapi/src/com/cloud/bridge/model/MHostMount.java  |   15 -----------
 awsapi/src/com/cloud/bridge/model/SAcl.java        |   15 -----------
 awsapi/src/com/cloud/bridge/model/SBucket.java     |   15 -----------
 awsapi/src/com/cloud/bridge/model/SHost.java       |   15 -----------
 awsapi/src/com/cloud/bridge/model/SMeta.java       |   15 -----------
 awsapi/src/com/cloud/bridge/model/SObject.java     |   15 -----------
 awsapi/src/com/cloud/bridge/model/SObjectItem.java |   15 -----------
 .../com/cloud/bridge/model/UserCredentials.java    |   15 -----------
 awsapi/src/com/cloud/bridge/persist/EntityDao.java |   15 -----------
 .../cloud/bridge/persist/GMTDateTimeUserType.java  |   15 -----------
 .../com/cloud/bridge/persist/PersistContext.java   |   15 -----------
 .../com/cloud/bridge/persist/PersistException.java |   15 -----------
 .../src/com/cloud/bridge/persist/dao/BaseDao.java  |   15 -----------
 .../cloud/bridge/persist/dao/BucketPolicyDao.java  |   15 -----------
 .../bridge/persist/dao/CloudStackAccountDao.java   |   15 -----------
 .../persist/dao/CloudStackConfigurationDao.java    |   15 -----------
 .../persist/dao/CloudStackSvcOfferingDao.java      |   15 -----------
 .../src/com/cloud/bridge/persist/dao/MHostDao.java |   15 -----------
 .../cloud/bridge/persist/dao/MHostMountDao.java    |   15 -----------
 .../cloud/bridge/persist/dao/MultipartLoadDao.java |   15 -----------
 .../com/cloud/bridge/persist/dao/OfferingDao.java  |   15 -----------
 .../src/com/cloud/bridge/persist/dao/SAclDao.java  |   15 -----------
 .../com/cloud/bridge/persist/dao/SBucketDao.java   |   15 -----------
 .../src/com/cloud/bridge/persist/dao/SHostDao.java |   15 -----------
 .../src/com/cloud/bridge/persist/dao/SMetaDao.java |   15 -----------
 .../com/cloud/bridge/persist/dao/SObjectDao.java   |   15 -----------
 .../cloud/bridge/persist/dao/SObjectItemDao.java   |   15 -----------
 .../bridge/persist/dao/UserCredentialsDao.java     |   15 -----------
 .../com/cloud/bridge/service/EC2RestServlet.java   |   17 +------------
 .../com/cloud/bridge/service/EC2SoapService.java   |   17 +------------
 .../cloud/bridge/service/EC2SoapServiceImpl.java   |   17 +------------
 .../src/com/cloud/bridge/service/S3Constants.java  |   19 --------------
 .../com/cloud/bridge/service/S3RestServlet.java    |   20 +--------------
 .../src/com/cloud/bridge/service/UserContext.java  |   18 -------------
 awsapi/src/com/cloud/bridge/service/UserInfo.java  |   18 -------------
 .../service/controller/s3/S3BucketAction.java      |   15 -----------
 .../service/controller/s3/S3ObjectAction.java      |   17 +------------
 .../s3/S3SerializableServiceImplementation.java    |   15 -----------
 .../service/controller/s3/ServiceProvider.java     |   17 ------------
 .../service/controller/s3/ServletAction.java       |   15 -----------
 .../cloud/bridge/service/core/ec2/DiskOffer.java   |   15 -----------
 .../bridge/service/core/ec2/DiskOfferings.java     |   15 -----------
 .../cloud/bridge/service/core/ec2/EC2Address.java  |   15 -----------
 .../service/core/ec2/EC2AddressFilterSet.java      |   15 -----------
 .../service/core/ec2/EC2AssociateAddress.java      |   15 -----------
 .../core/ec2/EC2AvailabilityZonesFilterSet.java    |   18 -------------
 .../bridge/service/core/ec2/EC2CreateImage.java    |   15 -----------
 .../service/core/ec2/EC2CreateImageResponse.java   |   15 -----------
 .../bridge/service/core/ec2/EC2CreateKeyPair.java  |   19 --------------
 .../bridge/service/core/ec2/EC2CreateVolume.java   |   15 -----------
 .../bridge/service/core/ec2/EC2DeleteKeyPair.java  |   19 --------------
 .../service/core/ec2/EC2DescribeAddresses.java     |   15 -----------
 .../core/ec2/EC2DescribeAddressesResponse.java     |   15 -----------
 .../core/ec2/EC2DescribeAvailabilityZones.java     |   15 -----------
 .../ec2/EC2DescribeAvailabilityZonesResponse.java  |   15 -----------
 .../core/ec2/EC2DescribeImageAttribute.java        |   15 -----------
 .../bridge/service/core/ec2/EC2DescribeImages.java |   15 -----------
 .../core/ec2/EC2DescribeImagesResponse.java        |   15 -----------
 .../service/core/ec2/EC2DescribeInstances.java     |   15 -----------
 .../core/ec2/EC2DescribeInstancesResponse.java     |   15 -----------
 .../service/core/ec2/EC2DescribeKeyPairs.java      |   15 -----------
 .../core/ec2/EC2DescribeKeyPairsResponse.java      |   15 -----------
 .../service/core/ec2/EC2DescribeSnapshots.java     |   15 -----------
 .../core/ec2/EC2DescribeSnapshotsResponse.java     |   15 -----------
 .../service/core/ec2/EC2DescribeVolumes.java       |   15 -----------
 .../core/ec2/EC2DescribeVolumesResponse.java       |   15 -----------
 .../service/core/ec2/EC2DisassociateAddress.java   |   19 --------------
 .../cloud/bridge/service/core/ec2/EC2Engine.java   |   15 -----------
 .../cloud/bridge/service/core/ec2/EC2Filter.java   |   15 -----------
 .../bridge/service/core/ec2/EC2GroupFilterSet.java |   15 -----------
 .../cloud/bridge/service/core/ec2/EC2Image.java    |   15 -----------
 .../service/core/ec2/EC2ImageAttributes.java       |   15 -----------
 .../bridge/service/core/ec2/EC2ImportKeyPair.java  |   19 --------------
 .../cloud/bridge/service/core/ec2/EC2Instance.java |   15 -----------
 .../service/core/ec2/EC2InstanceFilterSet.java     |   15 -----------
 .../bridge/service/core/ec2/EC2IpPermission.java   |   15 -----------
 .../service/core/ec2/EC2KeyPairFilterSet.java      |   15 -----------
 .../service/core/ec2/EC2ModifyImageAttribute.java  |   15 -----------
 .../service/core/ec2/EC2RebootInstances.java       |   15 -----------
 .../bridge/service/core/ec2/EC2RegisterImage.java  |   15 -----------
 .../bridge/service/core/ec2/EC2ReleaseAddress.java |   15 -----------
 .../bridge/service/core/ec2/EC2RunInstances.java   |   15 -----------
 .../service/core/ec2/EC2RunInstancesResponse.java  |   15 -----------
 .../cloud/bridge/service/core/ec2/EC2Snapshot.java |   15 -----------
 .../service/core/ec2/EC2SnapshotFilterSet.java     |   15 -----------
 .../bridge/service/core/ec2/EC2StartInstances.java |   15 -----------
 .../core/ec2/EC2StartInstancesResponse.java        |   15 -----------
 .../bridge/service/core/ec2/EC2StopInstances.java  |   15 -----------
 .../service/core/ec2/EC2StopInstancesResponse.java |   15 -----------
 .../cloud/bridge/service/core/ec2/EC2Volume.java   |   15 -----------
 .../service/core/ec2/EC2VolumeFilterSet.java       |   15 -----------
 .../service/core/ec2/IpForwardingRuleResponse.java |   17 ------------
 .../bridge/service/core/ec2/OfferingBundle.java    |   15 -----------
 .../bridge/service/core/ec2/ServiceOffer.java      |   15 -----------
 .../bridge/service/core/ec2/ServiceOfferings.java  |   15 -----------
 .../service/core/s3/S3AccessControlList.java       |   15 -----------
 .../service/core/s3/S3AccessControlPolicy.java     |   15 -----------
 .../bridge/service/core/s3/S3BucketAdapter.java    |   18 -------------
 .../bridge/service/core/s3/S3BucketPolicy.java     |   15 -----------
 .../bridge/service/core/s3/S3CanonicalUser.java    |   15 -----------
 .../bridge/service/core/s3/S3ConditionFactory.java |   15 -----------
 .../service/core/s3/S3CopyObjectRequest.java       |    8 ------
 .../core/s3/S3CreateBucketConfiguration.java       |   18 -------------
 .../service/core/s3/S3CreateBucketRequest.java     |   18 -------------
 .../service/core/s3/S3CreateBucketResponse.java    |   18 -------------
 .../service/core/s3/S3DeleteBucketRequest.java     |   18 -------------
 .../service/core/s3/S3DeleteObjectRequest.java     |   18 -------------
 .../com/cloud/bridge/service/core/s3/S3Engine.java |   16 ------------
 .../s3/S3GetBucketAccessControlPolicyRequest.java  |   18 -------------
 .../s3/S3GetObjectAccessControlPolicyRequest.java  |   18 -------------
 .../bridge/service/core/s3/S3GetObjectRequest.java |   18 -------------
 .../service/core/s3/S3GetObjectResponse.java       |   18 -------------
 .../com/cloud/bridge/service/core/s3/S3Grant.java  |   16 ------------
 .../service/core/s3/S3HostCallingFormat.java       |    4 +-
 .../service/core/s3/S3ListAllMyBucketsEntry.java   |   18 -------------
 .../service/core/s3/S3ListAllMyBucketsRequest.java |   18 -------------
 .../core/s3/S3ListAllMyBucketsResponse.java        |   18 -------------
 .../service/core/s3/S3ListBucketObjectEntry.java   |   18 -------------
 .../service/core/s3/S3ListBucketPrefixEntry.java   |   18 -------------
 .../service/core/s3/S3ListBucketRequest.java       |   18 -------------
 .../service/core/s3/S3ListBucketResponse.java      |   18 -------------
 .../bridge/service/core/s3/S3MetaDataEntry.java    |   18 -------------
 .../bridge/service/core/s3/S3MultipartPart.java    |   15 -----------
 .../bridge/service/core/s3/S3MultipartUpload.java  |   15 -----------
 .../bridge/service/core/s3/S3PolicyAction.java     |   15 -----------
 .../service/core/s3/S3PolicyArnCondition.java      |   15 -----------
 .../service/core/s3/S3PolicyBoolCondition.java     |   15 -----------
 .../bridge/service/core/s3/S3PolicyCondition.java  |   15 -----------
 .../service/core/s3/S3PolicyConditionBlock.java    |   15 -----------
 .../bridge/service/core/s3/S3PolicyContext.java    |   15 -----------
 .../service/core/s3/S3PolicyDateCondition.java     |   15 -----------
 .../core/s3/S3PolicyIPAddressCondition.java        |   15 -----------
 .../service/core/s3/S3PolicyNumericCondition.java  |   15 -----------
 .../bridge/service/core/s3/S3PolicyPrincipal.java  |   15 -----------
 .../bridge/service/core/s3/S3PolicyStatement.java  |   15 -----------
 .../service/core/s3/S3PolicyStringCondition.java   |   15 -----------
 .../service/core/s3/S3PutObjectInlineRequest.java  |   15 -----------
 .../service/core/s3/S3PutObjectInlineResponse.java |   15 -----------
 .../bridge/service/core/s3/S3PutObjectRequest.java |   15 -----------
 .../service/core/s3/S3PutObjectResponse.java       |   15 -----------
 .../cloud/bridge/service/core/s3/S3Request.java    |   15 -----------
 .../cloud/bridge/service/core/s3/S3Response.java   |   18 -------------
 .../s3/S3SetBucketAccessControlPolicyRequest.java  |   18 -------------
 .../s3/S3SetObjectAccessControlPolicyRequest.java  |   18 -------------
 .../service/exception/ConfigurationException.java  |   18 -------------
 .../service/exception/EC2ServiceException.java     |   15 -----------
 .../service/exception/FileNotExistException.java   |   18 -------------
 .../service/exception/HostNotMountedException.java |   18 -------------
 .../service/exception/InternalErrorException.java  |   18 -------------
 .../exception/InvalidRequestContentException.java  |   18 -------------
 .../service/exception/NetworkIOException.java      |   18 -------------
 .../service/exception/NoSuchObjectException.java   |   18 -------------
 .../exception/ObjectAlreadyExistsException.java    |   18 -------------
 .../service/exception/OutOfServiceException.java   |   18 -------------
 .../service/exception/OutOfStorageException.java   |   18 -------------
 .../exception/PermissionDeniedException.java       |   18 -------------
 .../src/com/cloud/bridge/tool/CloudS3CmdTool.java  |   18 -------------
 .../com/cloud/bridge/util/AuthenticationUtils.java |   15 -----------
 .../com/cloud/bridge/util/CalendarDateParam.java   |   18 -------------
 .../com/cloud/bridge/util/CloudSessionFactory.java |   18 -------------
 .../bridge/util/CloudStackSessionFactory.java      |   15 -----------
 .../com/cloud/bridge/util/ConfigurationHelper.java |   18 -------------
 awsapi/src/com/cloud/bridge/util/Converter.java    |   18 -------------
 awsapi/src/com/cloud/bridge/util/CryptoHelper.java |   18 -------------
 .../bridge/util/DatabindingConverterUtil.java      |   16 ------------
 awsapi/src/com/cloud/bridge/util/DateHelper.java   |   18 -------------
 awsapi/src/com/cloud/bridge/util/EC2RestAuth.java  |   15 -----------
 awsapi/src/com/cloud/bridge/util/EntityParam.java  |   18 -------------
 .../bridge/util/ISO8601SimpleDateTimeFormat.java   |   15 -----------
 .../src/com/cloud/bridge/util/IpAddressRange.java  |   15 -----------
 .../src/com/cloud/bridge/util/IteratorHelper.java  |   18 -------------
 awsapi/src/com/cloud/bridge/util/JsonAccessor.java |   16 ------------
 awsapi/src/com/cloud/bridge/util/NetHelper.java    |   18 -------------
 awsapi/src/com/cloud/bridge/util/OrderedPair.java  |   16 ------------
 awsapi/src/com/cloud/bridge/util/PolicyParser.java |   15 -----------
 awsapi/src/com/cloud/bridge/util/QueryHelper.java  |   18 -------------
 awsapi/src/com/cloud/bridge/util/RestAuth.java     |   16 ------------
 awsapi/src/com/cloud/bridge/util/S3SoapAuth.java   |   15 -----------
 .../bridge/util/ServletRequestDataSource.java      |   18 -------------
 awsapi/src/com/cloud/bridge/util/StringHelper.java |   16 ------------
 awsapi/src/com/cloud/bridge/util/TextParam.java    |   18 -------------
 awsapi/src/com/cloud/bridge/util/TimeParam.java    |   18 -------------
 .../src/com/cloud/bridge/util/TimestampParam.java  |   18 -------------
 awsapi/src/com/cloud/bridge/util/Triple.java       |   18 +------------
 awsapi/src/com/cloud/bridge/util/XElement.java     |   18 -------------
 awsapi/src/com/cloud/bridge/util/XFlatten.java     |   15 -----------
 awsapi/src/com/cloud/bridge/util/XOmitNull.java    |   18 -------------
 .../src/com/cloud/bridge/util/XSerializable.java   |   18 -------------
 awsapi/src/com/cloud/bridge/util/XSerializer.java  |   18 -------------
 .../com/cloud/bridge/util/XSerializerAdapter.java  |   18 -------------
 .../cloud/bridge/util/XSerializerJsonAdapter.java  |   18 -------------
 .../cloud/bridge/util/XSerializerXmlAdapter.java   |   18 -------------
 awsapi/src/com/cloud/bridge/util/XmlHelper.java    |   18 -------------
 awsapi/src/com/cloud/stack/CloudStackApi.java      |   16 ------------
 awsapi/src/com/cloud/stack/CloudStackClient.java   |   16 ------------
 awsapi/src/com/cloud/stack/CloudStackCommand.java  |   16 ------------
 .../src/com/cloud/stack/models/ApiConstants.java   |   15 -----------
 .../com/cloud/stack/models/CloudStackAccount.java  |   19 --------------
 .../cloud/stack/models/CloudStackCapabilities.java |   19 --------------
 .../cloud/stack/models/CloudStackDiskOffering.java |   19 --------------
 .../com/cloud/stack/models/CloudStackEvent.java    |   19 --------------
 .../cloud/stack/models/CloudStackEventType.java    |   19 --------------
 .../stack/models/CloudStackExtractTemplate.java    |   19 --------------
 .../cloud/stack/models/CloudStackIdentifier.java   |   19 --------------
 .../cloud/stack/models/CloudStackInfoResponse.java |   15 -----------
 .../cloud/stack/models/CloudStackIngressRule.java  |   15 -----------
 .../stack/models/CloudStackInstanceGroup.java      |   19 --------------
 .../cloud/stack/models/CloudStackIpAddress.java    |   15 -----------
 .../com/cloud/stack/models/CloudStackKeyPair.java  |   15 -----------
 .../com/cloud/stack/models/CloudStackKeyValue.java |   19 --------------
 .../stack/models/CloudStackLoadBalancerRule.java   |   19 --------------
 .../com/cloud/stack/models/CloudStackNetwork.java  |   19 --------------
 .../stack/models/CloudStackNetworkOffering.java    |   19 --------------
 .../stack/models/CloudStackNetworkService.java     |   19 --------------
 .../models/CloudStackNetworkServiceCapability.java |   19 --------------
 .../src/com/cloud/stack/models/CloudStackNic.java  |   15 -----------
 .../cloud/stack/models/CloudStackOsCategory.java   |   19 --------------
 .../com/cloud/stack/models/CloudStackOsType.java   |   19 --------------
 .../cloud/stack/models/CloudStackPasswordData.java |   19 --------------
 .../stack/models/CloudStackPortForwardingRule.java |   19 --------------
 .../stack/models/CloudStackResourceLimit.java      |   15 -----------
 .../stack/models/CloudStackSecurityGroup.java      |   15 -----------
 .../models/CloudStackSecurityGroupIngress.java     |   19 --------------
 .../stack/models/CloudStackServiceOffering.java    |   19 --------------
 .../com/cloud/stack/models/CloudStackSnapshot.java |   15 -----------
 .../stack/models/CloudStackSnapshotPolicy.java     |   19 --------------
 .../com/cloud/stack/models/CloudStackTemplate.java |   19 --------------
 .../stack/models/CloudStackTemplatePermission.java |   19 --------------
 .../src/com/cloud/stack/models/CloudStackUser.java |   19 --------------
 .../com/cloud/stack/models/CloudStackUserVm.java   |   15 -----------
 .../com/cloud/stack/models/CloudStackVolume.java   |   15 -----------
 .../src/com/cloud/stack/models/CloudStackZone.java |   15 -----------
 242 files changed, 8 insertions(+), 3924 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
index f17e493..3b28c00 100644
--- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
+++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.auth.ec2;
 
 import org.apache.axiom.soap.SOAPEnvelope;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
index 7c446d2..2f72830 100644
--- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
+++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.auth.ec2;
 
 import org.apache.axis2.modules.Module;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java
index ac2fa55..f7a1a7e 100644
--- a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java
+++ b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.auth.s3;
 
 import java.sql.SQLException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
index 3e6bcac..b830902 100644
--- a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
+++ b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.auth.s3;
 
 import org.apache.axis2.modules.Module;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java b/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java
index 8e62a43..2932ecd 100644
--- a/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java
+++ b/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.io;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java b/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java
index 383fbd5..4d3c50e 100644
--- a/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java
+++ b/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.io;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
index 6373c03..03688fe 100644
--- a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
+++ b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.io;
 
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
index fe08d14..d4856a5 100644
--- a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
+++ b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.io;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
index 9aef8d7..22adfb8 100644
--- a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
+++ b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.lifecycle;
 
 import org.apache.axis2.context.ConfigurationContext;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/MHost.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/MHost.java b/awsapi/src/com/cloud/bridge/model/MHost.java
index 6c59bf0..2832e1a 100644
--- a/awsapi/src/com/cloud/bridge/model/MHost.java
+++ b/awsapi/src/com/cloud/bridge/model/MHost.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/MHostMount.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/MHostMount.java b/awsapi/src/com/cloud/bridge/model/MHostMount.java
index f70b1dc..d532568 100644
--- a/awsapi/src/com/cloud/bridge/model/MHostMount.java
+++ b/awsapi/src/com/cloud/bridge/model/MHostMount.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/SAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SAcl.java b/awsapi/src/com/cloud/bridge/model/SAcl.java
index 5008e73..bff7906 100644
--- a/awsapi/src/com/cloud/bridge/model/SAcl.java
+++ b/awsapi/src/com/cloud/bridge/model/SAcl.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/SBucket.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SBucket.java b/awsapi/src/com/cloud/bridge/model/SBucket.java
index 894f750..5f63a77 100644
--- a/awsapi/src/com/cloud/bridge/model/SBucket.java
+++ b/awsapi/src/com/cloud/bridge/model/SBucket.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/SHost.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SHost.java b/awsapi/src/com/cloud/bridge/model/SHost.java
index 5c8734a..874b095 100644
--- a/awsapi/src/com/cloud/bridge/model/SHost.java
+++ b/awsapi/src/com/cloud/bridge/model/SHost.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/SMeta.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SMeta.java b/awsapi/src/com/cloud/bridge/model/SMeta.java
index 248e1f9..8962771 100644
--- a/awsapi/src/com/cloud/bridge/model/SMeta.java
+++ b/awsapi/src/com/cloud/bridge/model/SMeta.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/SObject.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SObject.java b/awsapi/src/com/cloud/bridge/model/SObject.java
index 94743c6..73a2c9a 100644
--- a/awsapi/src/com/cloud/bridge/model/SObject.java
+++ b/awsapi/src/com/cloud/bridge/model/SObject.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/SObjectItem.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SObjectItem.java b/awsapi/src/com/cloud/bridge/model/SObjectItem.java
index 1f5b523..1429089 100644
--- a/awsapi/src/com/cloud/bridge/model/SObjectItem.java
+++ b/awsapi/src/com/cloud/bridge/model/SObjectItem.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/model/UserCredentials.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/UserCredentials.java b/awsapi/src/com/cloud/bridge/model/UserCredentials.java
index 5d0c687..b674f40 100644
--- a/awsapi/src/com/cloud/bridge/model/UserCredentials.java
+++ b/awsapi/src/com/cloud/bridge/model/UserCredentials.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/EntityDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/EntityDao.java b/awsapi/src/com/cloud/bridge/persist/EntityDao.java
index c040138..c7943a6 100644
--- a/awsapi/src/com/cloud/bridge/persist/EntityDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/EntityDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java b/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java
index d8e0946..b39f298 100644
--- a/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java
+++ b/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/PersistContext.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/PersistContext.java b/awsapi/src/com/cloud/bridge/persist/PersistContext.java
index 8efccac..8abc5da 100644
--- a/awsapi/src/com/cloud/bridge/persist/PersistContext.java
+++ b/awsapi/src/com/cloud/bridge/persist/PersistContext.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist;
 
 import java.sql.Connection;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/PersistException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/PersistException.java b/awsapi/src/com/cloud/bridge/persist/PersistException.java
index b7c5bfb..e2acfd2 100644
--- a/awsapi/src/com/cloud/bridge/persist/PersistException.java
+++ b/awsapi/src/com/cloud/bridge/persist/PersistException.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/BaseDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/BaseDao.java b/awsapi/src/com/cloud/bridge/persist/dao/BaseDao.java
index c3988e5..83679fa 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/BaseDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/BaseDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDao.java b/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDao.java
index 7705044..dda0e2d 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright 2011 Cloud.com, Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDao.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDao.java
index 40d6f43..31a5be8 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDao.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDao.java
index 0e3c467..ed16974 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDao.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDao.java
index fed8a6d..5013eac 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java
index 42559f6..1c5e81c 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import com.cloud.bridge.model.MHost;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java
index d1cc843..6753e9c 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import com.cloud.bridge.model.MHostMount;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
index ba212bc..0ab83eb 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright 2011 Cloud.com, Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/OfferingDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDao.java b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDao.java
index eff3ffc..358ce3d 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright 2011 Cloud.com, Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java
index 9343847..37f18f3 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.util.Date;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java
index 94b2b71..2584597 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java
index 45fe595..2641fdb 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import com.cloud.bridge.model.SHost;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java
index 889ab8d..1bc7933 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java
index cc97225..ac00e03 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java
index 7ccb684..62b424e 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import com.cloud.bridge.model.SObjectItem;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDao.java b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDao.java
index 1ec322e..4beb7a3 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDao.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.persist.dao;
 
 import java.sql.*;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
index e372e5c..ceaf59d 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service;
 
 import java.io.ByteArrayInputStream;
@@ -1861,4 +1846,4 @@ public class EC2RestServlet extends HttpServlet {
 	xmlWriter.close();
 	os.close();
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
index 0a5ed9e..1f7f612 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service;
 
 import org.apache.log4j.Logger;
@@ -583,4 +568,4 @@ public class EC2SoapService implements AmazonEC2SkeletonInterface {
 			AmazonEC2SkeletonInterface ec2Service = ServiceProvider.getInstance().getServiceImpl(AmazonEC2SkeletonInterface.class);
 			return ec2Service.importVolume(importVolume);
 		}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
index 01c78a8..9e10e09 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service;
 
 import java.util.ArrayList;
@@ -2299,4 +2284,4 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface  {
 	public ResetSnapshotAttributeResponse resetSnapshotAttribute(ResetSnapshotAttribute resetSnapshotAttribute) {
 		throw new EC2ServiceException(ClientError.Unsupported, "This operation is not available");
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/S3Constants.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/S3Constants.java b/awsapi/src/com/cloud/bridge/service/S3Constants.java
index c42c652..a86f3f9 100644
--- a/awsapi/src/com/cloud/bridge/service/S3Constants.java
+++ b/awsapi/src/com/cloud/bridge/service/S3Constants.java
@@ -14,27 +14,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service;
 
-/**
- * @author Kelven Yang
- * Constants used in S3 implementation, one place to hold commonly used constants
- */
 public interface S3Constants {
 	public final String BUCKET_ATTR_KEY = "s3-bucket";
 	public final String OBJECT_ATTR_KEY = "s3-object-key";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
index 370b2be..282385b 100644
--- a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service;
 
 import java.io.ByteArrayInputStream;
@@ -82,9 +67,6 @@ import com.cloud.bridge.util.HeaderParam;
 import com.cloud.bridge.util.RestAuth;
 import com.cloud.bridge.util.S3SoapAuth;
 
-/**
- * @author Kelven Yang, Mark Joseph, John Zucker
- */
 public class S3RestServlet extends HttpServlet {
 	private static final long serialVersionUID = -6168996266762804877L;
 	public static final String ENABLE_S3_API="enable.s3.api";
@@ -886,4 +868,4 @@ private S3ObjectAction routePlainPostRequest (HttpServletRequest request)
     		logger.info( "- End of request -" );
     	}
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/UserContext.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/UserContext.java b/awsapi/src/com/cloud/bridge/service/UserContext.java
index 7d587e9..74e4259 100644
--- a/awsapi/src/com/cloud/bridge/service/UserContext.java
+++ b/awsapi/src/com/cloud/bridge/service/UserContext.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -38,9 +23,6 @@ import org.apache.log4j.Logger;
 import com.cloud.bridge.service.exception.InternalErrorException;
 import com.cloud.bridge.util.StringHelper;
 
-/**
- * @author Kelven Yang
- */
 public class UserContext {
     protected final static Logger logger = Logger.getLogger(UserContext.class);
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/UserInfo.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/UserInfo.java b/awsapi/src/com/cloud/bridge/service/UserInfo.java
index 8761e53..bab10cd 100644
--- a/awsapi/src/com/cloud/bridge/service/UserInfo.java
+++ b/awsapi/src/com/cloud/bridge/service/UserInfo.java
@@ -14,26 +14,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service;
 
-/**
- * @author Kelven Yang
- */
 public class UserInfo {
 	private String accessKey;
 	private String secretKey;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
index 00120b4..39b5cf6 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service.controller.s3;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
index 727752d..0aba4ba 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service.controller.s3;
 
 import java.io.BufferedReader;
@@ -1274,4 +1259,4 @@ public class S3ObjectAction implements ServletAction {
     		return new OrderedPair<Integer, String>(500, e.toString());
     	}
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
index b930f68..1bb5834 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service.controller.s3;
 
 import java.util.Calendar;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
index b44a88e..7a36a4b 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
@@ -14,23 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/**
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved
- * 
- * This software is licensed under the GNU General Public License v3 or later.
- * 
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
 package com.cloud.bridge.service.controller.s3;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java
index 50cfbc3..1f73d36 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java
@@ -14,21 +14,6 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-/*
- * Copyright (C) 2011 Citrix Systems, Inc.  All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.cloud.bridge.service.controller.s3;
 
 import java.io.IOException;


Mime
View raw message