incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [20/30] more license header cleanups
Date Fri, 06 Jul 2012 19:03:39 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/ConfigurationHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/ConfigurationHelper.java b/awsapi/src/com/cloud/bridge/util/ConfigurationHelper.java
index b31437e..0d96c30 100644
--- a/awsapi/src/com/cloud/bridge/util/ConfigurationHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/ConfigurationHelper.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;
@@ -40,9 +25,6 @@ import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
 
 
-/**
- h* @author Kelven Yang
- */
 public class ConfigurationHelper {
 	
 	private static String configPath;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/Converter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/Converter.java b/awsapi/src/com/cloud/bridge/util/Converter.java
index 1687af4..2640c5f 100644
--- a/awsapi/src/com/cloud/bridge/util/Converter.java
+++ b/awsapi/src/com/cloud/bridge/util/Converter.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.util;
 
-/**
- * @author Kelven Yang
- */
 public class Converter {
 	public static boolean toBool(String value, boolean defaultValue) {
 		if(value != null && !value.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/CryptoHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/CryptoHelper.java b/awsapi/src/com/cloud/bridge/util/CryptoHelper.java
index bf54a28..f759a06 100644
--- a/awsapi/src/com/cloud/bridge/util/CryptoHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/CryptoHelper.java
@@ -14,25 +14,7 @@
 // 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;
 
-/**
- * @author Kelven Yang
- */
 public class CryptoHelper {
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.java b/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.java
index a6cfd6f..1d99096 100644
--- a/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.java
+++ b/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.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;
 
@@ -39,7 +24,6 @@ import java.util.Date;
 import org.apache.axis2.databinding.utils.ConverterUtil;
 
 /**
- * @author John Zucker
  * Custom subclass of org.apache.axis2.databinding.utils.ConverterUtil, i.e. the data conversion utility for
  * databindings in the ADB framework of Axis2.  The purpose of a custom class is to provide specific value
  * format conversions for certain datatypes, especially dates, timestamps and calendars for which the default

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/DateHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/DateHelper.java b/awsapi/src/com/cloud/bridge/util/DateHelper.java
index 561ffd6..2f16ef8 100644
--- a/awsapi/src/com/cloud/bridge/util/DateHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/DateHelper.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.text.DateFormat;
@@ -38,9 +23,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-/**
- * @author Kelven Yang
- */
 public class DateHelper {
     public static final TimeZone GMT_TIMEZONE = TimeZone.getTimeZone("GMT");
     public static final String YYYYMMDD_FORMAT = "yyyyMMddHHmmss";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java b/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java
index e915412..67b6076 100644
--- a/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java
+++ b/awsapi/src/com/cloud/bridge/util/EC2RestAuth.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.UnsupportedEncodingException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/EntityParam.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/EntityParam.java b/awsapi/src/com/cloud/bridge/util/EntityParam.java
index c11f4b9..8a4274d 100644
--- a/awsapi/src/com/cloud/bridge/util/EntityParam.java
+++ b/awsapi/src/com/cloud/bridge/util/EntityParam.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.util;
 
-/**
- * @author Kelven Yang
- */
 public class EntityParam {
 	private Object entity;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
index 2c34bce..1876419 100644
--- a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
+++ b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.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;
 

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/IteratorHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/IteratorHelper.java b/awsapi/src/com/cloud/bridge/util/IteratorHelper.java
index 03267cf..42befd3 100644
--- a/awsapi/src/com/cloud/bridge/util/IteratorHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/IteratorHelper.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.util;
 
 import java.util.Enumeration;
 import java.util.Iterator;
 
-/**
- * @author Kelven Yang
- */
 public class IteratorHelper {
 	public static <T> Iterable<T> enumerationAsIterable(final Enumeration<T> e) {
 		return new Iterable<T> () {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/JsonAccessor.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/JsonAccessor.java b/awsapi/src/com/cloud/bridge/util/JsonAccessor.java
index 127a401..c7720f6 100644
--- a/awsapi/src/com/cloud/bridge/util/JsonAccessor.java
+++ b/awsapi/src/com/cloud/bridge/util/JsonAccessor.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.math.BigDecimal;
@@ -50,7 +35,6 @@ import com.google.gson.JsonPrimitive;
  * 		rootobj.level1obj[1].property
  * 		this[0].level1obj[1].property
  * 
- * @author Kelven Yang
  */
 public class JsonAccessor {
 	private JsonElement _json;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/NetHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/NetHelper.java b/awsapi/src/com/cloud/bridge/util/NetHelper.java
index 5041277..caddec2 100644
--- a/awsapi/src/com/cloud/bridge/util/NetHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/NetHelper.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.net.InetAddress;
@@ -41,9 +26,6 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
-/**
- * @author Kelven Yang
- */
 public class NetHelper {
     protected final static Logger logger = Logger.getLogger(NetHelper.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/OrderedPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/OrderedPair.java b/awsapi/src/com/cloud/bridge/util/OrderedPair.java
index 0ef0881..3c8d0d5 100644
--- a/awsapi/src/com/cloud/bridge/util/OrderedPair.java
+++ b/awsapi/src/com/cloud/bridge/util/OrderedPair.java
@@ -14,25 +14,9 @@
 // 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;
 
 /** 
- * @author Kelven Yang, John Zucker
  * Reusable class whose instances encode any ordered pair (or 2-tuple) of values of types T1 and T2
  * Provide getters: getFirst(), getSecond()
  * Provide setters: setFirst(val), setSecond(val)

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/QueryHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/QueryHelper.java b/awsapi/src/com/cloud/bridge/util/QueryHelper.java
index 6f0a6a1..1a1b582 100644
--- a/awsapi/src/com/cloud/bridge/util/QueryHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/QueryHelper.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.Serializable;
@@ -41,9 +26,6 @@ import java.util.Locale;
 
 import org.hibernate.Query;
 
-/**
- * @author Kelven Yang
- */
 public class QueryHelper {
 	public static void bindParameters(Query query, Object[] params) {
 		int pos = 0;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/RestAuth.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/RestAuth.java b/awsapi/src/com/cloud/bridge/util/RestAuth.java
index 32794a3..33d2d47 100644
--- a/awsapi/src/com/cloud/bridge/util/RestAuth.java
+++ b/awsapi/src/com/cloud/bridge/util/RestAuth.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.security.InvalidKeyException;
@@ -53,7 +38,6 @@ import org.apache.log4j.Logger;
  * This class is used for the Authentication check for REST requests and Query String
  * Authentication requests.
  *
- * @author Kelven Yang, John Zucker, Salvatore Orlando
  */
 
 public class RestAuth {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/S3SoapAuth.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/S3SoapAuth.java b/awsapi/src/com/cloud/bridge/util/S3SoapAuth.java
index 4f49bb3..69549d0 100644
--- a/awsapi/src/com/cloud/bridge/util/S3SoapAuth.java
+++ b/awsapi/src/com/cloud/bridge/util/S3SoapAuth.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 javax.crypto.Mac;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/ServletRequestDataSource.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/ServletRequestDataSource.java b/awsapi/src/com/cloud/bridge/util/ServletRequestDataSource.java
index 04c0323..209feb3 100644
--- a/awsapi/src/com/cloud/bridge/util/ServletRequestDataSource.java
+++ b/awsapi/src/com/cloud/bridge/util/ServletRequestDataSource.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.IOException;
@@ -40,9 +25,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
-/**
- * @author Kelven Yang
- */
 public class ServletRequestDataSource implements DataSource {
     protected final static Logger logger = Logger.getLogger(ServletRequestDataSource.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/StringHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/StringHelper.java b/awsapi/src/com/cloud/bridge/util/StringHelper.java
index eeb38d4..3031719 100644
--- a/awsapi/src/com/cloud/bridge/util/StringHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/StringHelper.java
@@ -14,28 +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.util;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 /**
- * @author Kelven, John Zucker
  * Provide converters for regexp (case independent tokens)
  * Also provide upper case or lower case (default) converters for byte array b[] to hex String
  */

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/TextParam.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/TextParam.java b/awsapi/src/com/cloud/bridge/util/TextParam.java
index 7b85a68..0ac6311 100644
--- a/awsapi/src/com/cloud/bridge/util/TextParam.java
+++ b/awsapi/src/com/cloud/bridge/util/TextParam.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.util;
 
-/**
- * @author Kelven
- */
 public class TextParam {
 	private String textValue;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/TimeParam.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/TimeParam.java b/awsapi/src/com/cloud/bridge/util/TimeParam.java
index af630e5..fb01612 100644
--- a/awsapi/src/com/cloud/bridge/util/TimeParam.java
+++ b/awsapi/src/com/cloud/bridge/util/TimeParam.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.Date;
 
-/**
- * @author Kelven Yang
- */
 public class TimeParam {
 	private Date timeValue;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/TimestampParam.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/TimestampParam.java b/awsapi/src/com/cloud/bridge/util/TimestampParam.java
index 64d5d44..e1b2d31 100644
--- a/awsapi/src/com/cloud/bridge/util/TimestampParam.java
+++ b/awsapi/src/com/cloud/bridge/util/TimestampParam.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.Date;
 
-/**
- * @author Kelven Yang
- */
 public class TimestampParam {
 	private Date timestampValue;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/Triple.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/Triple.java b/awsapi/src/com/cloud/bridge/util/Triple.java
index dbeaa74..dd5aae7 100644
--- a/awsapi/src/com/cloud/bridge/util/Triple.java
+++ b/awsapi/src/com/cloud/bridge/util/Triple.java
@@ -14,25 +14,9 @@
 // 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;
 
 /** 
- * @author Kelven Yang, John Zucker
  * Reusable class whose instances encode any triple (or 3-tuple) of values of types T1, T2 and T3
  * Provide getters: getFirst(), getSecond(), getThird()
  * Provide setters: setFirst(val), setSecond(val), setThird(val)
@@ -77,4 +61,4 @@ public class Triple <T1, T2, T3> {
 		third = t3;
 		return this;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XElement.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XElement.java b/awsapi/src/com/cloud/bridge/util/XElement.java
index 782657b..7fc70a3 100644
--- a/awsapi/src/com/cloud/bridge/util/XElement.java
+++ b/awsapi/src/com/cloud/bridge/util/XElement.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.lang.annotation.ElementType;
@@ -36,9 +21,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author Kelven Yang
- */
 @Target({ElementType.TYPE, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface XElement {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XFlatten.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XFlatten.java b/awsapi/src/com/cloud/bridge/util/XFlatten.java
index bb338e4..d9c8945 100644
--- a/awsapi/src/com/cloud/bridge/util/XFlatten.java
+++ b/awsapi/src/com/cloud/bridge/util/XFlatten.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.lang.annotation.ElementType;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XOmitNull.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XOmitNull.java b/awsapi/src/com/cloud/bridge/util/XOmitNull.java
index 3efe781..60b879c 100644
--- a/awsapi/src/com/cloud/bridge/util/XOmitNull.java
+++ b/awsapi/src/com/cloud/bridge/util/XOmitNull.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.lang.annotation.ElementType;
@@ -36,9 +21,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author Kelven Yang
- */
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface XOmitNull {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XSerializable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XSerializable.java b/awsapi/src/com/cloud/bridge/util/XSerializable.java
index 303bdd1..2451e9c 100644
--- a/awsapi/src/com/cloud/bridge/util/XSerializable.java
+++ b/awsapi/src/com/cloud/bridge/util/XSerializable.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.util;
 
 import java.io.PrintWriter;
 
 import org.w3c.dom.Node;
 
-/**
- * @author Kelven Yang
- */
 public interface XSerializable {
 	void serializeTo(XSerializer serializer, int indentLevel, PrintWriter writer);
 	void serializeFrom(XSerializer serializer, Object object, Node node);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XSerializer.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XSerializer.java b/awsapi/src/com/cloud/bridge/util/XSerializer.java
index 73ca3a5..12c7401 100644
--- a/awsapi/src/com/cloud/bridge/util/XSerializer.java
+++ b/awsapi/src/com/cloud/bridge/util/XSerializer.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.IOException;
@@ -54,9 +39,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-/**
- * @author Kelven Yang
- */
 public class XSerializer {
     protected final static Logger logger = Logger.getLogger(XSerializer.class);
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XSerializerAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XSerializerAdapter.java b/awsapi/src/com/cloud/bridge/util/XSerializerAdapter.java
index 6672eb4..a695412 100644
--- a/awsapi/src/com/cloud/bridge/util/XSerializerAdapter.java
+++ b/awsapi/src/com/cloud/bridge/util/XSerializerAdapter.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.util;
 
 import java.io.PrintWriter;
 import java.lang.reflect.Field;
 
-/**
- * @author Kelven Yang
- */
 public interface XSerializerAdapter {
 	void setSerializer(XSerializer serializer);
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java b/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java
index ddafb0a..9662f50 100644
--- a/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java
+++ b/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.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.PrintWriter;
@@ -38,9 +23,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 
-/**
- * @author Kelven Yang
- */
 public class XSerializerJsonAdapter implements XSerializerAdapter {
 	private XSerializer serializer;
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java b/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java
index d02ee63..212b70e 100644
--- a/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java
+++ b/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.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.PrintWriter;
@@ -38,9 +23,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 
-/**
- * @author Kelven
- */
 public class XSerializerXmlAdapter implements XSerializerAdapter {
 
 	private XSerializer serializer;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/bridge/util/XmlHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XmlHelper.java b/awsapi/src/com/cloud/bridge/util/XmlHelper.java
index 1d02101..d8f6b94 100644
--- a/awsapi/src/com/cloud/bridge/util/XmlHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/XmlHelper.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.ByteArrayInputStream;
@@ -57,9 +42,6 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-/**
- * @author Kelven Yang
- */
 public class XmlHelper {
 	protected static Logger logger = Logger.getLogger(XmlHelper.class);
 	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/CloudStackApi.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/CloudStackApi.java b/awsapi/src/com/cloud/stack/CloudStackApi.java
index 095a29a..65db139 100644
--- a/awsapi/src/com/cloud/stack/CloudStackApi.java
+++ b/awsapi/src/com/cloud/stack/CloudStackApi.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.stack;
 
@@ -72,7 +57,6 @@ import com.google.gson.reflect.TypeToken;
 /**
  * The goal here is to wrap the actual CloudStack API calls...
  * 
- * @author slriv
  *
  */
 public class CloudStackApi {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/CloudStackClient.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/CloudStackClient.java b/awsapi/src/com/cloud/stack/CloudStackClient.java
index a4c7c63..5002aa5 100644
--- a/awsapi/src/com/cloud/stack/CloudStackClient.java
+++ b/awsapi/src/com/cloud/stack/CloudStackClient.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.stack;
 
 import java.io.IOException;
@@ -51,7 +36,6 @@ import com.google.gson.JsonParser;
  * CloudStackClient implements a simple CloudStack client object, it can be used to execute CloudStack commands 
  * with JSON response
  * 
- * @author Kelven Yang
  */
 public class CloudStackClient {
     protected final static Logger logger = Logger.getLogger(CloudStackClient.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/CloudStackCommand.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/CloudStackCommand.java b/awsapi/src/com/cloud/stack/CloudStackCommand.java
index 492ea95..ea73df4 100644
--- a/awsapi/src/com/cloud/stack/CloudStackCommand.java
+++ b/awsapi/src/com/cloud/stack/CloudStackCommand.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.stack;
 
 import java.io.UnsupportedEncodingException;
@@ -48,7 +33,6 @@ import org.apache.commons.codec.binary.Base64;
 /**
  * CloudStackCommand wraps command properties that are being sent to CloudStack
  * 
- * @author Kelven Yang
  */
 public class CloudStackCommand {
 	Map<String, String> _params = new HashMap<String, String>(); 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/ApiConstants.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/ApiConstants.java b/awsapi/src/com/cloud/stack/models/ApiConstants.java
index 6a6df71..3305843 100644
--- a/awsapi/src/com/cloud/stack/models/ApiConstants.java
+++ b/awsapi/src/com/cloud/stack/models/ApiConstants.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.stack.models;
 
 public class ApiConstants {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackAccount.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackAccount.java b/awsapi/src/com/cloud/stack/models/CloudStackAccount.java
index 633337b..0da846c 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackAccount.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackAccount.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackAccount {
 	@SerializedName(ApiConstants.ID)
 	private String id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java b/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java
index c4dbff9..629fa95 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackCapabilities {
 	@SerializedName(ApiConstants.CLOUD_STACK_VERSION)
 	private String cloudStackVersion;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java b/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java
index 9c51070..308941c 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackDiskOffering {
 	@SerializedName(ApiConstants.ID)
 	private String id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackEvent.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackEvent.java b/awsapi/src/com/cloud/stack/models/CloudStackEvent.java
index 96073a2..6b98676 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackEvent.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackEvent.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackEvent {
 	@SerializedName(ApiConstants.ID)
 	private Long id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackEventType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackEventType.java b/awsapi/src/com/cloud/stack/models/CloudStackEventType.java
index b01fba8..81202e2 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackEventType.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackEventType.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackEventType {
 	@SerializedName(ApiConstants.NAME)
 	private String name;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java b/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java
index 5841572..c0974c0 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackExtractTemplate {
 	@SerializedName(ApiConstants.ID)
 	Long id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackIdentifier.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackIdentifier.java b/awsapi/src/com/cloud/stack/models/CloudStackIdentifier.java
index e893c5d..5fa450e 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackIdentifier.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackIdentifier.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackIdentifier {
 	@SerializedName(ApiConstants.CLOUD_IDENTIFIER)
 	private String cloudIdentifier;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackInfoResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackInfoResponse.java b/awsapi/src/com/cloud/stack/models/CloudStackInfoResponse.java
index 147bfa9..f78482a 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackInfoResponse.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackInfoResponse.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.stack.models;
 
 import com.google.gson.annotations.SerializedName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java b/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java
index de6e102..68d5462 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackIngressRule.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.stack.models;
 
 import com.google.gson.annotations.SerializedName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java b/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java
index b42a776..cf012e5 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackInstanceGroup {
 	@SerializedName(ApiConstants.ID)
 	private Long id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackIpAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackIpAddress.java b/awsapi/src/com/cloud/stack/models/CloudStackIpAddress.java
index f02817d..72a3d51 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackIpAddress.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackIpAddress.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.stack.models;
 
 import com.google.gson.annotations.SerializedName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.java b/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.java
index cadf46f..221f0dd 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.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.stack.models;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackKeyValue.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackKeyValue.java b/awsapi/src/com/cloud/stack/models/CloudStackKeyValue.java
index 132d830..9ce2d88 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackKeyValue.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackKeyValue.java
@@ -14,28 +14,9 @@
 // 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.stack.models;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackKeyValue {
 	private String key;
 	private String value;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java b/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java
index 180eafa..9e4451e 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackLoadBalancerRule {
 	@SerializedName(ApiConstants.ID)
 	private String id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackNetwork.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNetwork.java b/awsapi/src/com/cloud/stack/models/CloudStackNetwork.java
index e175065..bbc0cef 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackNetwork.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackNetwork.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.stack.models;
 
@@ -36,10 +21,6 @@ import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackNetwork {
 	@SerializedName(ApiConstants.ID)
 	private String id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java b/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java
index e9f41ce..576b426 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackNetworkOffering {
 	@SerializedName(ApiConstants.ID)	
 	private String id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.java b/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.java
index e4ee48b..81f6a09 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.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.stack.models;
 
@@ -36,10 +21,6 @@ import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackNetworkService {
 	
 	@SerializedName(ApiConstants.NAME)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java b/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java
index c978130..e59898c 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackNetworkServiceCapability {
 	@SerializedName(ApiConstants.NAME)
 	private String name;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackNic.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNic.java b/awsapi/src/com/cloud/stack/models/CloudStackNic.java
index e910e90..a3fde39 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackNic.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackNic.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.stack.models;
 
 import com.google.gson.annotations.SerializedName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java b/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java
index 2f44102..715c34e 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackOsCategory {
 	@SerializedName(ApiConstants.ID)
 	private Long id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackOsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackOsType.java b/awsapi/src/com/cloud/stack/models/CloudStackOsType.java
index 9a74ade..65ad90e 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackOsType.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackOsType.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackOsType {
 	@SerializedName(ApiConstants.ID)
 	private String id;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java b/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java
index 49d506c..115125c 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackPasswordData {
 	
 	@SerializedName(ApiConstants.ENCRYPTED_PASSWORD)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c3a8cd4/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java b/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java
index 3f57952..19aedfa 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java
@@ -14,30 +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.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackPortForwardingRule {
 	@SerializedName(ApiConstants.ID)
 	private String id;


Mime
View raw message