cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [4/8] more license header cleanups
Date Thu, 05 Jul 2012 02:38:49 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketConfiguration.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketConfiguration.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketConfiguration.java
index 5b47b3a..7b48f8a 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketConfiguration.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketConfiguration.java
@@ -14,29 +14,11 @@
 // 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.core.s3;
 
 import com.cloud.bridge.util.XElement;
 import com.cloud.bridge.util.XSerializer;
 
-/**
- * @author Kelven Yang
- */
 public class S3CreateBucketConfiguration {
 	@XElement(name="LocationConstraint")
 	private String location;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketRequest.java
index fba2794..01ee973 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3CreateBucketRequest extends S3Request {
 	protected String bucketName;
 	protected S3CreateBucketConfiguration config;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketResponse.java
index 232a80f..4003709 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3CreateBucketResponse.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3CreateBucketResponse extends S3Response {
 	protected String bucketName;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteBucketRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteBucketRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteBucketRequest.java
index 67d4f2d..a5ae0a2 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteBucketRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteBucketRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3DeleteBucketRequest extends S3Request {
 	protected String bucketName;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteObjectRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteObjectRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteObjectRequest.java
index b4e6956..e4aaf58 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteObjectRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3DeleteObjectRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3DeleteObjectRequest extends S3Request {
 	protected String bucketName;
 	protected String key;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java
index 73a1aac..e8b73a4 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.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.core.s3;
 
 import java.io.IOException;
@@ -98,7 +83,6 @@ import com.cloud.bridge.util.OrderedPair;
 import com.cloud.bridge.util.Triple;
 
 /**
- * @author Kelven Yang, John Zucker
  * The CRUD control actions to be invoked from S3BucketAction or S3ObjectAction.
  */
 public class S3Engine {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3GetBucketAccessControlPolicyRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3GetBucketAccessControlPolicyRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3GetBucketAccessControlPolicyRequest.java
index cf5a55b..cca25c2 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3GetBucketAccessControlPolicyRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3GetBucketAccessControlPolicyRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3GetBucketAccessControlPolicyRequest extends S3Request {
 	protected String bucketName;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectAccessControlPolicyRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectAccessControlPolicyRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectAccessControlPolicyRequest.java
index c3df873..6ecd819 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectAccessControlPolicyRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectAccessControlPolicyRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3GetObjectAccessControlPolicyRequest extends S3Request {
 	protected String bucketName;
 	protected String key;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectRequest.java
index a889078..b6c0c6d 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3GetObjectRequest extends S3Request {
 	private String bucketName;
 	private String key;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectResponse.java
index 25f6d99..2f19115 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3GetObjectResponse.java
@@ -14,30 +14,12 @@
 // 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.core.s3;
 
 import java.util.Calendar;
 
 import javax.activation.DataHandler;
 
-/**
- * @author Kelven Yang
- */
 public class S3GetObjectResponse extends S3Response {
 	protected String ETag;
 	protected Calendar lastModified;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java
index 265586f..b3c07be 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.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.core.s3;
 
 import java.util.List;
@@ -38,7 +23,6 @@ import com.cloud.bridge.model.SBucket;
 import com.cloud.bridge.service.exception.UnsupportedException;
 
 /**
- * @author Kelven Yang, John Zucker
  * Each relation holds
  * a grantee - which is one of SAcl.GRANTEE_USER, SAcl.GRANTEE_ALLUSERS, SAcl.GRANTEE_AUTHENTICATED 
  * a permission - which is one of SAcl.PERMISSION_PASS, SAcl.PERMISSION_NONE, SAcl.PERMISSION_READ,

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java
index d8c3161..03c07a1 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java
@@ -21,7 +21,7 @@ import java.net.URL;
 import java.util.Iterator;
 import java.util.Map;
 
-/* @auth John Zucker
+/*
  * Provide a suitable subclass of format class to reflect the choice of bucket referencing format supported by
  * AWS S3 in constructing the URL for requesting RESTful services.  The three possibilities are
  * (*) hostname followed by bucket as path information (sometimes termed the path style)
@@ -154,4 +154,4 @@ public abstract class S3HostCallingFormat
       return bucket.length() != 0;
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java
index 01743e5..d561fb0 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java
@@ -14,29 +14,11 @@
 // 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.core.s3;
 
 import java.util.Calendar;
 import java.util.TimeZone;
 
-/**
- * @author Kelven Yang
- */
 public class S3ListAllMyBucketsEntry {
 	private String name;
 	private Calendar creationDate;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsRequest.java
index 4c6d661..9eac964 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3ListAllMyBucketsRequest extends S3Request {
 	public S3ListAllMyBucketsRequest() {
 		super();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsResponse.java
index 30a2f1f..35d81e0 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsResponse.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3ListAllMyBucketsResponse extends S3Response {
 
 	private S3CanonicalUser owner;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketObjectEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketObjectEntry.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketObjectEntry.java
index cf14662..3486965 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketObjectEntry.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketObjectEntry.java
@@ -14,30 +14,12 @@
 // 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.core.s3;
 
 import java.util.Calendar;
 
 import com.cloud.bridge.util.XElement;
 
-/**
- * @author Kelven Yang
- */
 public class S3ListBucketObjectEntry {
 
 	@XElement(name="Key")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketPrefixEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketPrefixEntry.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketPrefixEntry.java
index 97189c9..f08e2c1 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketPrefixEntry.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketPrefixEntry.java
@@ -14,28 +14,10 @@
 // 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.core.s3;
 
 import com.cloud.bridge.util.XElement;
 
-/**
- * @author Kelven Yang
- */
 public class S3ListBucketPrefixEntry {
 	
 	@XElement(name="Prefix")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketRequest.java
index d91d559..d395f91 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3ListBucketRequest extends S3Request {
 	protected String bucketName;
 	protected String prefix;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketResponse.java
index 3f312ec..bfae0a5 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListBucketResponse.java
@@ -14,28 +14,10 @@
 // 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.core.s3;
 
 import com.cloud.bridge.util.XElement;
 
-/**
- * @author Kelven Yang
- */
 public class S3ListBucketResponse extends S3Response {
 	
 	@XElement(name="Name")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3MetaDataEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3MetaDataEntry.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3MetaDataEntry.java
index da11747..c4505f6 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3MetaDataEntry.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3MetaDataEntry.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.core.s3;
 
-/**
- * @author Kelven
- */
 public class S3MetaDataEntry {
 	private String name;
 	private String value;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartPart.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartPart.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartPart.java
index 73ab2a7..a435062 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartPart.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartPart.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.service.core.s3;
 
 import java.util.Calendar;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartUpload.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartUpload.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartUpload.java
index bc566cd..ea47ce5 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartUpload.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3MultipartUpload.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.service.core.s3;
 
 import java.util.Calendar;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyAction.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyAction.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyAction.java
index 4a4d5d7..cc3283f 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyAction.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyAction.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.service.core.s3;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java
index 5e2226c..5063437 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.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.service.core.s3;
 
 import java.text.ParseException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.java
index cb63b3c..9a95788 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.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.service.core.s3;
 
 import java.text.ParseException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java
index 38a6a86..6ab5dec 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.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.service.core.s3;
 
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.java
index 6ab8f79..a884ea6 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.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.service.core.s3;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyContext.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyContext.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyContext.java
index c63d0c0..b83c7f4 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyContext.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyContext.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.service.core.s3;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java
index a48e12b..56a7d7b 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.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.service.core.s3;
 
 import java.text.ParseException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java
index 1c31715..0170532 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.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.service.core.s3;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java
index 33d05d6..a208924 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.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.service.core.s3;
 
 import java.text.ParseException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyPrincipal.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyPrincipal.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyPrincipal.java
index 5270289..e277847 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyPrincipal.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyPrincipal.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.service.core.s3;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStatement.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStatement.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStatement.java
index 5532566..12ff0ff 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStatement.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStatement.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.service.core.s3;
 
 import com.cloud.bridge.service.core.s3.S3BucketPolicy.PolicyAccess;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java
index 6950c18..d046db9 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.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.service.core.s3;
 
 import java.text.ParseException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.java
index 46f0ec5..c3a0deb 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.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.core.s3;
 
 import java.io.ByteArrayInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.java
index c376d8a..b75ee05 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.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.core.s3;
 
 import java.util.Calendar;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.java
index d2e82b8..076e61a 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.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.core.s3;
 
 import java.io.InputStream;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.java
index bc6899c..28385e3 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.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.core.s3;
 
 import java.util.Calendar;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.java
index a1ecb5c..439b98d 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.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.core.s3;
 
 import java.util.Calendar;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3Response.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Response.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Response.java
index fe6b0af..c014c06 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Response.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Response.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3Response {
 	protected int resultCode;
 	protected String version;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3SetBucketAccessControlPolicyRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3SetBucketAccessControlPolicyRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3SetBucketAccessControlPolicyRequest.java
index 0dbe47f..b2091c4 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3SetBucketAccessControlPolicyRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3SetBucketAccessControlPolicyRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3SetBucketAccessControlPolicyRequest extends S3Request {
 	protected String bucketName;
 	protected S3AccessControlList acl;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/core/s3/S3SetObjectAccessControlPolicyRequest.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3SetObjectAccessControlPolicyRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3SetObjectAccessControlPolicyRequest.java
index 4fafdaa..2683eb7 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3SetObjectAccessControlPolicyRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3SetObjectAccessControlPolicyRequest.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.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3SetObjectAccessControlPolicyRequest extends S3Request {
 	protected String bucketName;
 	protected String key;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/ConfigurationException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/ConfigurationException.java b/awsapi/src/com/cloud/bridge/service/exception/ConfigurationException.java
index 74dc344..982e1cd 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/ConfigurationException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/ConfigurationException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class ConfigurationException extends RuntimeException {
 	private static final long serialVersionUID = 6810626920539827556L;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/EC2ServiceException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/EC2ServiceException.java b/awsapi/src/com/cloud/bridge/service/exception/EC2ServiceException.java
index b7578b8..f40278d 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/EC2ServiceException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/EC2ServiceException.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.exception;
 
 import javax.xml.namespace.QName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/FileNotExistException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/FileNotExistException.java b/awsapi/src/com/cloud/bridge/service/exception/FileNotExistException.java
index 6bdf79e..c35412f 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/FileNotExistException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/FileNotExistException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class FileNotExistException extends RuntimeException {
 	private static final long serialVersionUID = 5512751425783765269L;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/HostNotMountedException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/HostNotMountedException.java b/awsapi/src/com/cloud/bridge/service/exception/HostNotMountedException.java
index af69b43..71667be 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/HostNotMountedException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/HostNotMountedException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class HostNotMountedException extends RuntimeException {
 	private static final long serialVersionUID = 1798153102422117938L;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/InternalErrorException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/InternalErrorException.java b/awsapi/src/com/cloud/bridge/service/exception/InternalErrorException.java
index f025ce7..88916c5 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/InternalErrorException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/InternalErrorException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class InternalErrorException extends RuntimeException {
 	private static final long serialVersionUID = 2996134346433756736L;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/InvalidRequestContentException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/InvalidRequestContentException.java b/awsapi/src/com/cloud/bridge/service/exception/InvalidRequestContentException.java
index f80ceb7..841f19e3 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/InvalidRequestContentException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/InvalidRequestContentException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class InvalidRequestContentException extends RuntimeException {
 	private static final long serialVersionUID = -3047694313765739359L;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/NetworkIOException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/NetworkIOException.java b/awsapi/src/com/cloud/bridge/service/exception/NetworkIOException.java
index 27d0cf8..6d0c926 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/NetworkIOException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/NetworkIOException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class NetworkIOException extends RuntimeException {
 	private static final long serialVersionUID = 1797775871115398024L;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/NoSuchObjectException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/NoSuchObjectException.java b/awsapi/src/com/cloud/bridge/service/exception/NoSuchObjectException.java
index 50ba820..be9b58d 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/NoSuchObjectException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/NoSuchObjectException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class NoSuchObjectException extends RuntimeException {
 
 	private static final long serialVersionUID = -5727022800215753259L;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/ObjectAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/ObjectAlreadyExistsException.java b/awsapi/src/com/cloud/bridge/service/exception/ObjectAlreadyExistsException.java
index f469de8..6358cba 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/ObjectAlreadyExistsException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/ObjectAlreadyExistsException.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.exception;
 
-/**
- * @author Kelven
- */
 public class ObjectAlreadyExistsException extends RuntimeException {
 	private static final long serialVersionUID = 2705708093384620824L;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/OutOfServiceException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/OutOfServiceException.java b/awsapi/src/com/cloud/bridge/service/exception/OutOfServiceException.java
index 1d103d2..c680bb9 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/OutOfServiceException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/OutOfServiceException.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.exception;
 
-/**
- * @author Kelven
- */
 public class OutOfServiceException extends RuntimeException {
 	private static final long serialVersionUID = 8457313467757867680L;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/OutOfStorageException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/OutOfStorageException.java b/awsapi/src/com/cloud/bridge/service/exception/OutOfStorageException.java
index d1fe0d8..2d2f462 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/OutOfStorageException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/OutOfStorageException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class OutOfStorageException extends RuntimeException {
 	private static final long serialVersionUID = -2236697888220815218L;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/service/exception/PermissionDeniedException.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/exception/PermissionDeniedException.java b/awsapi/src/com/cloud/bridge/service/exception/PermissionDeniedException.java
index 21e4214..95d20e9 100644
--- a/awsapi/src/com/cloud/bridge/service/exception/PermissionDeniedException.java
+++ b/awsapi/src/com/cloud/bridge/service/exception/PermissionDeniedException.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.exception;
 
-/**
- * @author Kelven Yang
- */
 public class PermissionDeniedException extends RuntimeException {
 	private static final long serialVersionUID = -5816172859594116468L;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java b/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java
index f7e1b20..ab27c1d 100644
--- a/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java
+++ b/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.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.tool;
 
 import java.io.File;
@@ -59,9 +44,6 @@ import com.amazon.s3.client.AmazonS3Stub.PutObjectInline;
 import com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse;
 import com.amazon.s3.client.AmazonS3Stub.Status;
 
-/**
- * @author Kelven Yang
- */
 public class CloudS3CmdTool {
 	private String serviceUrl;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java
index 3e0fee3..fb2fc39 100644
--- a/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java
+++ b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.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.util;
 
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/CalendarDateParam.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/CalendarDateParam.java b/awsapi/src/com/cloud/bridge/util/CalendarDateParam.java
index 5edc8ca..a5d92b7 100644
--- a/awsapi/src/com/cloud/bridge/util/CalendarDateParam.java
+++ b/awsapi/src/com/cloud/bridge/util/CalendarDateParam.java
@@ -14,28 +14,10 @@
 // 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.util;
 
 import java.util.Calendar;
 
-/**
- * @author Kelven Yang
- */
 public class CalendarDateParam {
 	private Calendar dateValue;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/CloudSessionFactory.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/CloudSessionFactory.java b/awsapi/src/com/cloud/bridge/util/CloudSessionFactory.java
index 7b85836..404f463 100644
--- a/awsapi/src/com/cloud/bridge/util/CloudSessionFactory.java
+++ b/awsapi/src/com/cloud/bridge/util/CloudSessionFactory.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.util;
 
 import java.io.File;
@@ -44,9 +29,6 @@ import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
 import org.jasypt.properties.EncryptableProperties;
 import org.apache.log4j.Logger;
 
-/**
- * @author Kelven Yang
- */
 public class CloudSessionFactory {
 	private static CloudSessionFactory instance;
 	public static final Logger logger = Logger.getLogger(CloudSessionFactory.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.java b/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.java
index 4578818..a5e97b8 100644
--- a/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.java
+++ b/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.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.util;
 
 import java.io.File;


Mime
View raw message