You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/07 02:23:50 UTC

git commit: Removed @author tag from bunch of resources

Updated Branches:
  refs/heads/vpc 5be0a3eeb -> a6086dc80


Removed @author tag from bunch of resources


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

Branch: refs/heads/vpc
Commit: a6086dc806d6307750380905a1ee3a8ba28e982e
Parents: 5be0a3e
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Fri Jul 6 17:25:36 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 6 17:25:36 2012 -0700

----------------------------------------------------------------------
 api/src/com/cloud/agent/api/PlugNicAnswer.java     |    3 ---
 api/src/com/cloud/agent/api/PlugNicCommand.java    |    3 ---
 .../com/cloud/agent/api/SetSourceNatAnswer.java    |    3 ---
 .../cloud/agent/api/SetupGuestNetworkAnswer.java   |    3 ---
 .../cloud/agent/api/SetupGuestNetworkCommand.java  |    3 ---
 api/src/com/cloud/agent/api/UnPlugNicAnswer.java   |    3 ---
 api/src/com/cloud/agent/api/UnPlugNicCommand.java  |    3 ---
 .../com/cloud/agent/api/routing/IpAssocAnswer.java |    6 +-----
 .../cloud/agent/api/routing/IpAssocCommand.java    |    5 -----
 .../cloud/agent/api/routing/IpAssocVpcCommand.java |    3 ---
 .../agent/api/routing/SetNetworkACLCommand.java    |    3 ---
 .../routing/SetPortForwardingRulesVpcCommand.java  |    3 ---
 .../agent/api/routing/SetSourceNatCommand.java     |    3 ---
 .../agent/api/routing/SetStaticRouteAnswer.java    |    3 ---
 .../agent/api/routing/SetStaticRouteCommand.java   |    3 ---
 .../com/cloud/api/BaseListTaggedResourcesCmd.java  |    3 ---
 .../api/commands/CreatePrivateGatewayCmd.java      |    3 ---
 .../cloud/api/commands/CreateStaticRouteCmd.java   |    6 ------
 api/src/com/cloud/api/commands/CreateTagsCmd.java  |    5 -----
 api/src/com/cloud/api/commands/CreateVPCCmd.java   |    5 -----
 .../cloud/api/commands/CreateVPCOfferingCmd.java   |    3 ---
 .../cloud/api/commands/DeleteNetworkACLCmd.java    |    3 ---
 .../api/commands/DeletePrivateGatewayCmd.java      |    3 ---
 .../cloud/api/commands/DeleteStaticRouteCmd.java   |    4 ----
 api/src/com/cloud/api/commands/DeleteTagsCmd.java  |    5 -----
 api/src/com/cloud/api/commands/DeleteVPCCmd.java   |    4 ----
 .../cloud/api/commands/DeleteVPCOfferingCmd.java   |    3 ---
 .../cloud/api/commands/ListPrivateGatewaysCmd.java |    4 ----
 .../cloud/api/commands/ListStaticRoutesCmd.java    |    5 -----
 api/src/com/cloud/api/commands/ListTagsCmd.java    |    4 ----
 .../cloud/api/commands/ListVPCOfferingsCmd.java    |    3 ---
 api/src/com/cloud/api/commands/ListVPCsCmd.java    |    4 +---
 api/src/com/cloud/api/commands/RestartVPCCmd.java  |    3 ---
 api/src/com/cloud/api/commands/UpdateVPCCmd.java   |    3 ---
 .../cloud/api/commands/UpdateVPCOfferingCmd.java   |    3 ---
 .../cloud/api/response/PrivateGatewayResponse.java |    4 ----
 .../cloud/api/response/ResourceTagResponse.java    |    4 ----
 .../cloud/api/response/StaticRouteResponse.java    |    3 ---
 .../cloud/api/response/VpcOfferingResponse.java    |    3 ---
 api/src/com/cloud/api/response/VpcResponse.java    |    4 ----
 .../network/VpcVirtualNetworkApplianceService.java |    3 ---
 .../network/element/NetworkACLServiceProvider.java |    3 ---
 api/src/com/cloud/network/element/VpcProvider.java |    3 ---
 .../cloud/network/firewall/NetworkACLService.java  |    3 ---
 api/src/com/cloud/network/vpc/PrivateGateway.java  |    3 ---
 api/src/com/cloud/network/vpc/PrivateIp.java       |    3 ---
 api/src/com/cloud/network/vpc/StaticRoute.java     |    4 ----
 .../com/cloud/network/vpc/StaticRouteProfile.java  |    3 ---
 api/src/com/cloud/network/vpc/Vpc.java             |    4 ----
 api/src/com/cloud/network/vpc/VpcGateway.java      |    3 ---
 api/src/com/cloud/network/vpc/VpcOffering.java     |    4 ----
 api/src/com/cloud/network/vpc/VpcService.java      |    3 ---
 .../com/cloud/server/TaggedResourceService.java    |    5 -----
 api/src/com/cloud/vm/PluggableNics.java            |    3 ---
 .../com/cloud/network/RouterNetworkDaoImpl.java    |    4 +---
 server/src/com/cloud/network/RouterNetworkVO.java  |    3 ---
 .../network/element/VpcVirtualRouterElement.java   |    4 ----
 .../router/VpcVirtualNetworkApplianceManager.java  |    5 +----
 .../VpcVirtualNetworkApplianceManagerImpl.java     |    3 ---
 .../com/cloud/network/vpc/Dao/PrivateIpDao.java    |    3 ---
 .../cloud/network/vpc/Dao/PrivateIpDaoImpl.java    |    6 ------
 .../com/cloud/network/vpc/Dao/StaticRouteDao.java  |    3 ---
 .../cloud/network/vpc/Dao/StaticRouteDaoImpl.java  |    3 ---
 server/src/com/cloud/network/vpc/Dao/VpcDao.java   |    4 +---
 .../src/com/cloud/network/vpc/Dao/VpcDaoImpl.java  |    3 ---
 .../com/cloud/network/vpc/Dao/VpcGatewayDao.java   |    4 +---
 .../cloud/network/vpc/Dao/VpcGatewayDaoImpl.java   |    3 ---
 .../com/cloud/network/vpc/Dao/VpcOfferingDao.java  |    4 +---
 .../cloud/network/vpc/Dao/VpcOfferingDaoImpl.java  |    4 +---
 .../network/vpc/Dao/VpcOfferingServiceMapDao.java  |    4 +---
 .../vpc/Dao/VpcOfferingServiceMapDaoImpl.java      |    4 +---
 .../com/cloud/network/vpc/NetworkACLManager.java   |    4 +---
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |    3 ---
 .../cloud/network/vpc/PrivateGatewayProfile.java   |    4 +---
 .../com/cloud/network/vpc/PrivateIpAddress.java    |    4 +---
 server/src/com/cloud/network/vpc/PrivateIpVO.java  |    3 ---
 .../src/com/cloud/network/vpc/StaticRouteVO.java   |    3 ---
 server/src/com/cloud/network/vpc/VpcGatewayVO.java |    3 ---
 server/src/com/cloud/network/vpc/VpcManager.java   |    3 ---
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |    4 ----
 .../cloud/network/vpc/VpcOfferingServiceMapVO.java |    3 ---
 .../src/com/cloud/network/vpc/VpcOfferingVO.java   |    3 ---
 server/src/com/cloud/network/vpc/VpcVO.java        |    4 ----
 server/src/com/cloud/tags/ResourceTagVO.java       |    3 ---
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |    4 +---
 server/src/com/cloud/tags/dao/ResourceTagDao.java  |   10 ----------
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java    |   13 -------------
 .../src/com/cloud/upgrade/dao/Upgrade301to302.java |    3 ---
 .../src/com/cloud/upgrade/dao/Upgrade302to303.java |    3 ---
 89 files changed, 14 insertions(+), 318 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/PlugNicAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PlugNicAnswer.java b/api/src/com/cloud/agent/api/PlugNicAnswer.java
index 3a76240..8cb4fa8 100644
--- a/api/src/com/cloud/agent/api/PlugNicAnswer.java
+++ b/api/src/com/cloud/agent/api/PlugNicAnswer.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.agent.api;
 
-/**
- * @author Alena Prokharchyk
- */
 public class PlugNicAnswer extends Answer{
     public PlugNicAnswer() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/PlugNicCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PlugNicCommand.java b/api/src/com/cloud/agent/api/PlugNicCommand.java
index 7d34004..ac77d42 100644
--- a/api/src/com/cloud/agent/api/PlugNicCommand.java
+++ b/api/src/com/cloud/agent/api/PlugNicCommand.java
@@ -15,9 +15,6 @@ package com.cloud.agent.api;
 import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
 
-/**
- * @author Alena Prokharchyk
- */
 public class PlugNicCommand extends Command {
     
     VirtualMachineTO vm;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/SetSourceNatAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetSourceNatAnswer.java b/api/src/com/cloud/agent/api/SetSourceNatAnswer.java
index 089f1f7..3c6b085 100644
--- a/api/src/com/cloud/agent/api/SetSourceNatAnswer.java
+++ b/api/src/com/cloud/agent/api/SetSourceNatAnswer.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.agent.api;
 
-/**
- * @author Alena Prokharchyk
- */
 public class SetSourceNatAnswer extends Answer{
     public SetSourceNatAnswer() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java b/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
index e20a9c5..798c4f9 100644
--- a/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
+++ b/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.agent.api;
 
-/**
- * @author Alena Prokharchyk
- */
 public class SetupGuestNetworkAnswer extends Answer{
     public SetupGuestNetworkAnswer() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
index 1245e6e..9d233fe 100644
--- a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
+++ b/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
@@ -15,9 +15,6 @@ package com.cloud.agent.api;
 import com.cloud.agent.api.routing.NetworkElementCommand;
 import com.cloud.agent.api.to.NicTO;
 
-/**
- * @author Alena Prokharchyk
- */
 public class SetupGuestNetworkCommand extends NetworkElementCommand{
     String dhcpRange;
     String networkDomain;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/UnPlugNicAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UnPlugNicAnswer.java b/api/src/com/cloud/agent/api/UnPlugNicAnswer.java
index cd87c72..815c3d7 100644
--- a/api/src/com/cloud/agent/api/UnPlugNicAnswer.java
+++ b/api/src/com/cloud/agent/api/UnPlugNicAnswer.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.agent.api;
 
-/**
- * @author Alena Prokharchyk
- */
 public class UnPlugNicAnswer extends Answer{
     public UnPlugNicAnswer() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/UnPlugNicCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UnPlugNicCommand.java b/api/src/com/cloud/agent/api/UnPlugNicCommand.java
index 26d9441..3c97254 100644
--- a/api/src/com/cloud/agent/api/UnPlugNicCommand.java
+++ b/api/src/com/cloud/agent/api/UnPlugNicCommand.java
@@ -15,9 +15,6 @@ package com.cloud.agent.api;
 import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
 
-/**
- * @author Alena Prokharchyk
- */
 public class UnPlugNicCommand extends Command{
     VirtualMachineTO vm;
     NicTO nic;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
index 8f0025f..1892196 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
@@ -17,11 +17,7 @@
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;
-/**
- * 
- * @author alena
- *
- */
+
 public class IpAssocAnswer extends Answer{
     String[] results;
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
index e8dd222..5326b11 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
@@ -18,11 +18,6 @@ package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.IpAddressTO;
 
-
-/**
- * @author alena
- *
- */
 public class IpAssocCommand extends NetworkElementCommand {
     
 	IpAddressTO[] ipAddresses;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
index 7ab57b4..4867f8c 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
@@ -14,9 +14,6 @@ package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.IpAddressTO;
 
-/**
- * @author Alena Prokharchyk
- */
 public class IpAssocVpcCommand extends IpAssocCommand{
     protected IpAssocVpcCommand() {
         super();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
index 42e6329..0e0cf73 100644
--- a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
@@ -17,9 +17,6 @@ import java.util.List;
 import com.cloud.agent.api.to.NetworkACLTO;
 import com.cloud.agent.api.to.NicTO;
 
-/**
- * @author Alena Prokharchyk
- */
 public class SetNetworkACLCommand extends NetworkElementCommand{
     NetworkACLTO[] rules;
     NicTO nic;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
index e6e91f5..4ccee57 100644
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
@@ -16,9 +16,6 @@ import java.util.List;
 
 import com.cloud.agent.api.to.PortForwardingRuleTO;
 
-/**
- * @author Alena Prokharchyk
- */
 public class SetPortForwardingRulesVpcCommand extends SetPortForwardingRulesCommand{
     protected SetPortForwardingRulesVpcCommand() {
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java b/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
index 5f2f7c0..fa05b28 100644
--- a/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
@@ -14,9 +14,6 @@ package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.IpAddressTO;
 
-/**
- * @author Alena Prokharchyk
- */
 public class SetSourceNatCommand extends NetworkElementCommand{
     IpAddressTO ipAddress;
     boolean add;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java b/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
index 93e79aa..8d51579 100644
--- a/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
@@ -14,9 +14,6 @@ package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;
 
-/**
- * @author Alena Prokharchyk
- */
 public class SetStaticRouteAnswer extends Answer{
     String[] results;
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java b/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
index 1ab59d7..6835345 100644
--- a/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
@@ -16,9 +16,6 @@ import java.util.List;
 
 import com.cloud.network.vpc.StaticRouteProfile;
 
-/**
- * @author Alena Prokharchyk
- */
 public class SetStaticRouteCommand extends NetworkElementCommand{
     StaticRouteProfile[] staticRoutes;
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/BaseListTaggedResourcesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/BaseListTaggedResourcesCmd.java b/api/src/com/cloud/api/BaseListTaggedResourcesCmd.java
index 9a70b10..f1d8f85 100644
--- a/api/src/com/cloud/api/BaseListTaggedResourcesCmd.java
+++ b/api/src/com/cloud/api/BaseListTaggedResourcesCmd.java
@@ -19,9 +19,6 @@ import java.util.Map;
 
 import com.cloud.exception.InvalidParameterValueException;
 
-/**
- * @author Alena Prokharchyk
- */
 public abstract class BaseListTaggedResourcesCmd extends BaseListProjectAndAccountResourcesCmd{
     @Parameter(name = ApiConstants.TAGS, type = CommandType.MAP, description = "List resources by tags (key/value pairs)")
     private Map tags;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java b/api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
index d493b8b..fbae5ac 100644
--- a/api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
+++ b/api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
@@ -34,9 +34,6 @@ import com.cloud.network.vpc.PrivateGateway;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
 @Implementation(description="Creates a private gateway", responseObject=PrivateGatewayResponse.class)
 public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreatePrivateGatewayCmd.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/CreateStaticRouteCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/CreateStaticRouteCmd.java b/api/src/com/cloud/api/commands/CreateStaticRouteCmd.java
index 4be141b..c4f99f1 100644
--- a/api/src/com/cloud/api/commands/CreateStaticRouteCmd.java
+++ b/api/src/com/cloud/api/commands/CreateStaticRouteCmd.java
@@ -13,7 +13,6 @@
 package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
-
 import com.cloud.api.ApiConstants;
 import com.cloud.api.BaseAsyncCmd;
 import com.cloud.api.BaseAsyncCreateCmd;
@@ -29,15 +28,10 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.vpc.PrivateGateway;
 import com.cloud.network.vpc.StaticRoute;
 import com.cloud.network.vpc.VpcGateway;
 import com.cloud.user.UserContext;
 
-/**
- * @author Alena Prokharchyk
- */
-
 @Implementation(description="Creates a static route", responseObject=StaticRouteResponse.class)
 public class CreateStaticRouteCmd extends BaseAsyncCreateCmd{
     private static final String s_name = "createstaticrouteresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/CreateTagsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/CreateTagsCmd.java b/api/src/com/cloud/api/commands/CreateTagsCmd.java
index f87ae6e..9d287fe 100644
--- a/api/src/com/cloud/api/commands/CreateTagsCmd.java
+++ b/api/src/com/cloud/api/commands/CreateTagsCmd.java
@@ -35,11 +35,6 @@ import com.cloud.api.response.SuccessResponse;
 import com.cloud.event.EventTypes;
 import com.cloud.server.ResourceTag;
 import com.cloud.server.ResourceTag.TaggedResourceType;
-
-/**
- * @author Alena Prokharchyk
- */
-
 @Implementation(description = "Creates resource tag(s)", responseObject = SuccessResponse.class, since = "Burbank")
 public class CreateTagsCmd extends BaseAsyncCmd{
     public static final Logger s_logger = Logger.getLogger(CreateTagsCmd.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/CreateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/CreateVPCCmd.java b/api/src/com/cloud/api/commands/CreateVPCCmd.java
index 11c8ad6..7d35aa3 100644
--- a/api/src/com/cloud/api/commands/CreateVPCCmd.java
+++ b/api/src/com/cloud/api/commands/CreateVPCCmd.java
@@ -13,7 +13,6 @@
 package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
-
 import com.cloud.api.ApiConstants;
 import com.cloud.api.BaseAsyncCreateCmd;
 import com.cloud.api.BaseCmd;
@@ -28,10 +27,6 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.user.UserContext;
-
-/**
- * @author Alena Prokharchyk
- */
 public class CreateVPCCmd extends BaseAsyncCreateCmd{
     public static final Logger s_logger = Logger.getLogger(CreateVPCCmd.class.getName());
     private static final String s_name = "createvpcresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/CreateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/CreateVPCOfferingCmd.java b/api/src/com/cloud/api/commands/CreateVPCOfferingCmd.java
index b841181..de270f9 100644
--- a/api/src/com/cloud/api/commands/CreateVPCOfferingCmd.java
+++ b/api/src/com/cloud/api/commands/CreateVPCOfferingCmd.java
@@ -27,9 +27,6 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.network.vpc.VpcOffering;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
 public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd{
     public static final Logger s_logger = Logger.getLogger(CreateVPCOfferingCmd.class.getName());
     private static final String _name = "createvpcofferingresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/DeleteNetworkACLCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/DeleteNetworkACLCmd.java b/api/src/com/cloud/api/commands/DeleteNetworkACLCmd.java
index 9c08465..2032f74 100644
--- a/api/src/com/cloud/api/commands/DeleteNetworkACLCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteNetworkACLCmd.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.api.commands;
 
-/**
- * @author Alena Prokharchyk
- */
 import org.apache.log4j.Logger;
 
 import com.cloud.api.ApiConstants;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/DeletePrivateGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/DeletePrivateGatewayCmd.java b/api/src/com/cloud/api/commands/DeletePrivateGatewayCmd.java
index 8371458..7fa5c58 100644
--- a/api/src/com/cloud/api/commands/DeletePrivateGatewayCmd.java
+++ b/api/src/com/cloud/api/commands/DeletePrivateGatewayCmd.java
@@ -31,9 +31,6 @@ import com.cloud.network.vpc.VpcGateway;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-/**
- * @author Alena Prokharchyk
- */
 @Implementation(description="Deletes a Private gateway", responseObject=SuccessResponse.class)
 public class DeletePrivateGatewayCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeletePrivateGatewayCmd.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/DeleteStaticRouteCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/DeleteStaticRouteCmd.java b/api/src/com/cloud/api/commands/DeleteStaticRouteCmd.java
index a6fc85b..4699fbd 100644
--- a/api/src/com/cloud/api/commands/DeleteStaticRouteCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteStaticRouteCmd.java
@@ -29,10 +29,6 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.vpc.StaticRoute;
 import com.cloud.user.UserContext;
 
-/**
- * @author Alena Prokharchyk
- */
-
 @Implementation(description="Deletes a static route", responseObject=SuccessResponse.class)
 public class DeleteStaticRouteCmd extends BaseAsyncCmd{
     public static final Logger s_logger = Logger.getLogger(DeleteStaticRouteCmd.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/DeleteTagsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/DeleteTagsCmd.java b/api/src/com/cloud/api/commands/DeleteTagsCmd.java
index df6e173..85295c8 100644
--- a/api/src/com/cloud/api/commands/DeleteTagsCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteTagsCmd.java
@@ -34,11 +34,6 @@ import com.cloud.api.ServerApiException;
 import com.cloud.api.response.SuccessResponse;
 import com.cloud.event.EventTypes;
 import com.cloud.server.ResourceTag.TaggedResourceType;
-
-/**
- * @author Alena Prokharchyk
- */
-
 @Implementation(description = "Deleting resource tag(s)", responseObject = SuccessResponse.class, since = "Burbank")
 public class DeleteTagsCmd extends BaseAsyncCmd{
     public static final Logger s_logger = Logger.getLogger(DeleteTagsCmd.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/DeleteVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/DeleteVPCCmd.java b/api/src/com/cloud/api/commands/DeleteVPCCmd.java
index 5a80f29..8225f36 100644
--- a/api/src/com/cloud/api/commands/DeleteVPCCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteVPCCmd.java
@@ -23,14 +23,10 @@ import com.cloud.api.ServerApiException;
 import com.cloud.api.response.SuccessResponse;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
 public class DeleteVPCCmd extends BaseAsyncCmd{
     public static final Logger s_logger = Logger.getLogger(DeleteVPCCmd.class.getName());
     private static final String s_name = "deletevpcresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/DeleteVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/DeleteVPCOfferingCmd.java b/api/src/com/cloud/api/commands/DeleteVPCOfferingCmd.java
index b32b17b..dc08c42 100644
--- a/api/src/com/cloud/api/commands/DeleteVPCOfferingCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteVPCOfferingCmd.java
@@ -24,9 +24,6 @@ import com.cloud.api.response.SuccessResponse;
 import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
 public class DeleteVPCOfferingCmd extends BaseAsyncCmd{
     public static final Logger s_logger = Logger.getLogger(DeleteVPCOfferingCmd.class.getName());
     private static final String s_name = "deletevpcofferingresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/ListPrivateGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListPrivateGatewaysCmd.java b/api/src/com/cloud/api/commands/ListPrivateGatewaysCmd.java
index 67ff27d..bc4cc1f 100644
--- a/api/src/com/cloud/api/commands/ListPrivateGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListPrivateGatewaysCmd.java
@@ -18,7 +18,6 @@ import java.util.List;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.BaseCmd.CommandType;
 import com.cloud.api.BaseListProjectAndAccountResourcesCmd;
 import com.cloud.api.IdentityMapper;
 import com.cloud.api.Implementation;
@@ -27,9 +26,6 @@ import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.PrivateGatewayResponse;
 import com.cloud.network.vpc.PrivateGateway;
 
-/**
- * @author Alena Prokharchyk
- */
 @Implementation(description="List private gateways", responseObject=PrivateGatewayResponse.class)
 public class ListPrivateGatewaysCmd extends BaseListProjectAndAccountResourcesCmd{
     public static final Logger s_logger = Logger.getLogger(ListPrivateGatewaysCmd.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/ListStaticRoutesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListStaticRoutesCmd.java b/api/src/com/cloud/api/commands/ListStaticRoutesCmd.java
index f3e0021..03a06d4 100644
--- a/api/src/com/cloud/api/commands/ListStaticRoutesCmd.java
+++ b/api/src/com/cloud/api/commands/ListStaticRoutesCmd.java
@@ -14,7 +14,6 @@ package com.cloud.api.commands;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import com.cloud.api.ApiConstants;
 import com.cloud.api.BaseListProjectAndAccountResourcesCmd;
 import com.cloud.api.IdentityMapper;
@@ -24,10 +23,6 @@ import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.StaticRouteResponse;
 import com.cloud.network.vpc.StaticRoute;
 
-/**
- * @author Alena Prokharchyk
- */
-
 @Implementation(description="Lists all static routes", responseObject=StaticRouteResponse.class)
 public class ListStaticRoutesCmd extends BaseListProjectAndAccountResourcesCmd {
     private static final String s_name = "liststaticroutesresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/ListTagsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListTagsCmd.java b/api/src/com/cloud/api/commands/ListTagsCmd.java
index 2c22679..ff49609 100644
--- a/api/src/com/cloud/api/commands/ListTagsCmd.java
+++ b/api/src/com/cloud/api/commands/ListTagsCmd.java
@@ -28,10 +28,6 @@ import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.ResourceTagResponse;
 import com.cloud.server.ResourceTag;
 
-/**
- * @author Alena Prokharchyk
- */
-
 @Implementation(description = "List resource tag(s)", responseObject = ResourceTagResponse.class, since = "Burbank")
 public class ListTagsCmd extends BaseListProjectAndAccountResourcesCmd{
     private static final String s_name = "listtagsresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/ListVPCOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListVPCOfferingsCmd.java b/api/src/com/cloud/api/commands/ListVPCOfferingsCmd.java
index adb9635..88dffc3 100644
--- a/api/src/com/cloud/api/commands/ListVPCOfferingsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVPCOfferingsCmd.java
@@ -25,9 +25,6 @@ import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.VpcOfferingResponse;
 import com.cloud.network.vpc.VpcOffering;
 
-/**
- * @author Alena Prokharchyk
- */
 public class ListVPCOfferingsCmd extends BaseListCmd{
     public static final Logger s_logger = Logger.getLogger(ListVPCOfferingsCmd.class.getName());
     private static final String _name = "listvpcofferingsresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/ListVPCsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListVPCsCmd.java b/api/src/com/cloud/api/commands/ListVPCsCmd.java
index 5d1a090..c9d4c1f 100644
--- a/api/src/com/cloud/api/commands/ListVPCsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVPCsCmd.java
@@ -25,9 +25,7 @@ import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.VpcResponse;
 import com.cloud.network.vpc.Vpc;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public class ListVPCsCmd extends BaseListAccountResourcesCmd{
     public static final Logger s_logger = Logger.getLogger(ListVPCsCmd.class.getName());
     private static final String s_name = "listvpcsresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/RestartVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/RestartVPCCmd.java b/api/src/com/cloud/api/commands/RestartVPCCmd.java
index a2ce626..1fde728 100644
--- a/api/src/com/cloud/api/commands/RestartVPCCmd.java
+++ b/api/src/com/cloud/api/commands/RestartVPCCmd.java
@@ -17,9 +17,6 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
 public class RestartVPCCmd extends BaseAsyncCmd{
     public static final Logger s_logger = Logger.getLogger(RestartVPCCmd.class.getName());
     private static final String _name = "restartvpcresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/UpdateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/UpdateVPCCmd.java b/api/src/com/cloud/api/commands/UpdateVPCCmd.java
index c447862..da3a8fe 100644
--- a/api/src/com/cloud/api/commands/UpdateVPCCmd.java
+++ b/api/src/com/cloud/api/commands/UpdateVPCCmd.java
@@ -25,9 +25,6 @@ import com.cloud.event.EventTypes;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
 public class UpdateVPCCmd extends BaseAsyncCmd{
     public static final Logger s_logger = Logger.getLogger(UpdateVPCCmd.class.getName());
     private static final String _name = "updatevpcresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/commands/UpdateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/UpdateVPCOfferingCmd.java b/api/src/com/cloud/api/commands/UpdateVPCOfferingCmd.java
index 38a519b..5878a39 100644
--- a/api/src/com/cloud/api/commands/UpdateVPCOfferingCmd.java
+++ b/api/src/com/cloud/api/commands/UpdateVPCOfferingCmd.java
@@ -25,9 +25,6 @@ import com.cloud.event.EventTypes;
 import com.cloud.network.vpc.VpcOffering;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
 public class UpdateVPCOfferingCmd extends BaseAsyncCmd{
     public static final Logger s_logger = Logger.getLogger(UpdateVPCOfferingCmd.class.getName());
     private static final String _name = "updatevpcofferingresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/response/PrivateGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PrivateGatewayResponse.java b/api/src/com/cloud/api/response/PrivateGatewayResponse.java
index 52f1b0b..c94b589 100644
--- a/api/src/com/cloud/api/response/PrivateGatewayResponse.java
+++ b/api/src/com/cloud/api/response/PrivateGatewayResponse.java
@@ -11,10 +11,6 @@
 // 
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.api.response;
-
-/**
- * @author Alena Prokharchyk
- */
 import com.cloud.api.ApiConstants;
 import com.cloud.serializer.Param;
 import com.cloud.utils.IdentityProxy;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/response/ResourceTagResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceTagResponse.java b/api/src/com/cloud/api/response/ResourceTagResponse.java
index 2c5fd9e..13566a7 100644
--- a/api/src/com/cloud/api/response/ResourceTagResponse.java
+++ b/api/src/com/cloud/api/response/ResourceTagResponse.java
@@ -21,10 +21,6 @@ import com.cloud.serializer.Param;
 import com.cloud.utils.IdentityProxy;
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author Alena Prokharchyk
- */
-
 @SuppressWarnings("unused")
 public class ResourceTagResponse extends BaseResponse implements ControlledEntityResponse{
     @SerializedName(ApiConstants.KEY) @Param(description="tag key name")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/response/StaticRouteResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StaticRouteResponse.java b/api/src/com/cloud/api/response/StaticRouteResponse.java
index 025be6e..469ee28 100644
--- a/api/src/com/cloud/api/response/StaticRouteResponse.java
+++ b/api/src/com/cloud/api/response/StaticRouteResponse.java
@@ -17,9 +17,6 @@ import com.cloud.serializer.Param;
 import com.cloud.utils.IdentityProxy;
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author Alena Prokharchyk
- */
 @SuppressWarnings("unused")
 public class StaticRouteResponse extends BaseResponse implements ControlledEntityResponse{
     @SerializedName(ApiConstants.ID) @Param(description="the ID of static route")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/response/VpcOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpcOfferingResponse.java b/api/src/com/cloud/api/response/VpcOfferingResponse.java
index 8fe5361..60366cb 100644
--- a/api/src/com/cloud/api/response/VpcOfferingResponse.java
+++ b/api/src/com/cloud/api/response/VpcOfferingResponse.java
@@ -20,9 +20,6 @@ import com.cloud.serializer.Param;
 import com.cloud.utils.IdentityProxy;
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author Alena Prokharchyk
- */
 @SuppressWarnings("unused")
 public class VpcOfferingResponse extends BaseResponse{
     @SerializedName("id") @Param(description="the id of the vpc offering")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/api/response/VpcResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpcResponse.java b/api/src/com/cloud/api/response/VpcResponse.java
index c2f1197..dda5b7c 100644
--- a/api/src/com/cloud/api/response/VpcResponse.java
+++ b/api/src/com/cloud/api/response/VpcResponse.java
@@ -20,10 +20,6 @@ import com.cloud.serializer.Param;
 import com.cloud.utils.IdentityProxy;
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author Alena Prokharchyk
- */
-
 @SuppressWarnings("unused")
 public class VpcResponse extends BaseResponse implements ControlledEntityResponse{
     @SerializedName("id") @Param(description="the id of the VPC")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java b/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
index 078d405..7cda264 100644
--- a/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
@@ -17,9 +17,6 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.router.VirtualRouter;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface VpcVirtualNetworkApplianceService {
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/element/NetworkACLServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/NetworkACLServiceProvider.java b/api/src/com/cloud/network/element/NetworkACLServiceProvider.java
index 92c4bb4..5dbf331 100644
--- a/api/src/com/cloud/network/element/NetworkACLServiceProvider.java
+++ b/api/src/com/cloud/network/element/NetworkACLServiceProvider.java
@@ -18,9 +18,6 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.Network;
 import com.cloud.network.rules.FirewallRule;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface NetworkACLServiceProvider extends NetworkElement{
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/element/VpcProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/VpcProvider.java b/api/src/com/cloud/network/element/VpcProvider.java
index 3e369b3..0fa1bac 100644
--- a/api/src/com/cloud/network/element/VpcProvider.java
+++ b/api/src/com/cloud/network/element/VpcProvider.java
@@ -25,9 +25,6 @@ import com.cloud.network.vpc.StaticRouteProfile;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.vm.ReservationContext;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface VpcProvider extends NetworkElement{
     /**
      * Start vpc element as specified

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/firewall/NetworkACLService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/firewall/NetworkACLService.java b/api/src/com/cloud/network/firewall/NetworkACLService.java
index 4aaf058..86842a4 100644
--- a/api/src/com/cloud/network/firewall/NetworkACLService.java
+++ b/api/src/com/cloud/network/firewall/NetworkACLService.java
@@ -20,9 +20,6 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface NetworkACLService {
     FirewallRule getNetworkACL(long ruleId);
     boolean applyNetworkACLs(long networkId, Account caller) throws ResourceUnavailableException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/vpc/PrivateGateway.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/PrivateGateway.java b/api/src/com/cloud/network/vpc/PrivateGateway.java
index d23b1b4..b21d580 100644
--- a/api/src/com/cloud/network/vpc/PrivateGateway.java
+++ b/api/src/com/cloud/network/vpc/PrivateGateway.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.network.vpc;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface PrivateGateway extends VpcGateway{
     long getPhysicalNetworkId();
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/vpc/PrivateIp.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/PrivateIp.java b/api/src/com/cloud/network/vpc/PrivateIp.java
index cfcd41b..7a3bd03 100644
--- a/api/src/com/cloud/network/vpc/PrivateIp.java
+++ b/api/src/com/cloud/network/vpc/PrivateIp.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.network.vpc;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface PrivateIp {
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/vpc/StaticRoute.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/StaticRoute.java b/api/src/com/cloud/network/vpc/StaticRoute.java
index eb4d767..8628493 100644
--- a/api/src/com/cloud/network/vpc/StaticRoute.java
+++ b/api/src/com/cloud/network/vpc/StaticRoute.java
@@ -14,10 +14,6 @@ package com.cloud.network.vpc;
 
 import com.cloud.acl.ControlledEntity;
 
-
-/**
- * @author Alena Prokharchyk
- */
 public interface StaticRoute extends ControlledEntity{
     enum State {
         Staged, // route been created but has never got through network rule conflict detection.  Routes in this state can not be sent to VPC virtual router.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/vpc/StaticRouteProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/StaticRouteProfile.java b/api/src/com/cloud/network/vpc/StaticRouteProfile.java
index 75bfe75..666cffe 100644
--- a/api/src/com/cloud/network/vpc/StaticRouteProfile.java
+++ b/api/src/com/cloud/network/vpc/StaticRouteProfile.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.network.vpc;
 
-/**
- * @author Alena Prokharchyk
- */
 public class StaticRouteProfile implements StaticRoute{
     private long id;
     private String targetCidr;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/vpc/Vpc.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/Vpc.java b/api/src/com/cloud/network/vpc/Vpc.java
index 5efd2e8..d3806c0 100644
--- a/api/src/com/cloud/network/vpc/Vpc.java
+++ b/api/src/com/cloud/network/vpc/Vpc.java
@@ -15,10 +15,6 @@ package com.cloud.network.vpc;
 import com.cloud.acl.ControlledEntity;
 import com.cloud.network.Network;
 
-
-/**
- * @author Alena Prokharchyk
- */
 public interface Vpc extends ControlledEntity{
     public enum State {
         Enabled,

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/vpc/VpcGateway.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcGateway.java b/api/src/com/cloud/network/vpc/VpcGateway.java
index cde9a04..30e613c 100644
--- a/api/src/com/cloud/network/vpc/VpcGateway.java
+++ b/api/src/com/cloud/network/vpc/VpcGateway.java
@@ -15,9 +15,6 @@ package com.cloud.network.vpc;
 import com.cloud.acl.ControlledEntity;
 import com.cloud.api.Identity;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface VpcGateway extends Identity, ControlledEntity {
     public enum Type {
         Private,

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/vpc/VpcOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcOffering.java b/api/src/com/cloud/network/vpc/VpcOffering.java
index 167cdce..b3bae78 100644
--- a/api/src/com/cloud/network/vpc/VpcOffering.java
+++ b/api/src/com/cloud/network/vpc/VpcOffering.java
@@ -12,10 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.network.vpc;
 
-
-/**
- * @author Alena Prokharchyk
- */
 public interface VpcOffering {
     public enum State {
         Disabled,

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/network/vpc/VpcService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java
index fec9080..8585226 100644
--- a/api/src/com/cloud/network/vpc/VpcService.java
+++ b/api/src/com/cloud/network/vpc/VpcService.java
@@ -27,9 +27,6 @@ import com.cloud.network.Network;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface VpcService {
     
     public VpcOffering getVpcOffering(long vpcOfferingId);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/server/TaggedResourceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/TaggedResourceService.java b/api/src/com/cloud/server/TaggedResourceService.java
index 51a4779..dd1b1c6 100644
--- a/api/src/com/cloud/server/TaggedResourceService.java
+++ b/api/src/com/cloud/server/TaggedResourceService.java
@@ -16,17 +16,12 @@
 // under the License.package com.cloud.server;
 
 package com.cloud.server;
-
-
 import java.util.List;
 import java.util.Map;
 
 import com.cloud.api.commands.ListTagsCmd;
 import com.cloud.server.ResourceTag.TaggedResourceType;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface TaggedResourceService {
     
     TaggedResourceType getResourceType (String resourceTypeStr);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/api/src/com/cloud/vm/PluggableNics.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/PluggableNics.java b/api/src/com/cloud/vm/PluggableNics.java
index 3b6c349..9d15d2c 100644
--- a/api/src/com/cloud/vm/PluggableNics.java
+++ b/api/src/com/cloud/vm/PluggableNics.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.vm;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface PluggableNics {
     boolean canPlugNics();
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/RouterNetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/RouterNetworkDaoImpl.java b/server/src/com/cloud/network/RouterNetworkDaoImpl.java
index dcb6583..b772d68 100644
--- a/server/src/com/cloud/network/RouterNetworkDaoImpl.java
+++ b/server/src/com/cloud/network/RouterNetworkDaoImpl.java
@@ -21,9 +21,7 @@ import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Op;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public class RouterNetworkDaoImpl extends GenericDaoBase<RouterNetworkVO, Long> implements GenericDao<RouterNetworkVO, Long>{
     protected final GenericSearchBuilder<RouterNetworkVO, Long> RouterNetworksSearch;
     protected final SearchBuilder<RouterNetworkVO> AllFieldsSearch;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/RouterNetworkVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/RouterNetworkVO.java b/server/src/com/cloud/network/RouterNetworkVO.java
index 629a5f4..20b0896 100644
--- a/server/src/com/cloud/network/RouterNetworkVO.java
+++ b/server/src/com/cloud/network/RouterNetworkVO.java
@@ -23,9 +23,6 @@ import javax.persistence.Table;
 
 import com.cloud.network.Network.GuestType;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Entity
 @Table(name="router_network_ref")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
index 83a6450..30b8405 100644
--- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -60,10 +60,6 @@ import com.cloud.vm.ReservationContext;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.Type;
 import com.cloud.vm.VirtualMachineProfile;
-
-/**
- * @author Alena Prokharchyk
- */
 @Local(value = NetworkElement.class)
 public class VpcVirtualRouterElement extends VirtualRouterElement implements VpcProvider, Site2SiteVpnServiceProvider, NetworkACLServiceProvider{
     private static final Logger s_logger = Logger.getLogger(VpcVirtualRouterElement.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
index fd05e98..d18cda1 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
@@ -14,7 +14,6 @@ package com.cloud.network.router;
 
 import java.util.List;
 import java.util.Map;
-
 import com.cloud.deploy.DeployDestination;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
@@ -30,9 +29,7 @@ import com.cloud.user.Account;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.VirtualMachineProfile.Param;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplianceManager, VpcVirtualNetworkApplianceService{
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index c1ce80d..975f6f6 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -104,9 +104,6 @@ import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfile.Param;
 import com.cloud.vm.dao.VMInstanceDao;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Local(value = {VpcVirtualNetworkApplianceManager.class, VpcVirtualNetworkApplianceService.class})
 public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplianceManagerImpl implements VpcVirtualNetworkApplianceManager{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java b/server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java
index 9f8d811..4c9e87a 100644
--- a/server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java
+++ b/server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java
@@ -17,9 +17,6 @@ import java.util.List;
 import com.cloud.network.vpc.PrivateIpVO;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface PrivateIpDao extends GenericDao<PrivateIpVO, Long>{
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java b/server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java
index 7fc626c..f67b61a 100644
--- a/server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java
@@ -14,11 +14,8 @@ package com.cloud.network.vpc.Dao;
 
 import java.util.Date;
 import java.util.List;
-
 import javax.ejb.Local;
-
 import org.apache.log4j.Logger;
-
 import com.cloud.network.vpc.PrivateIpVO;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
@@ -29,9 +26,6 @@ import com.cloud.utils.db.SearchCriteria.Func;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.db.Transaction;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Local(value = PrivateIpDao.class)
 @DB(txn = false)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java b/server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java
index a9515e8..6b59dac 100644
--- a/server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java
+++ b/server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java
@@ -18,9 +18,6 @@ import com.cloud.network.vpc.StaticRoute;
 import com.cloud.network.vpc.StaticRouteVO;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface StaticRouteDao extends GenericDao<StaticRouteVO, Long>{
     
     boolean setStateToAdd(StaticRouteVO rule);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java b/server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
index d4b195b..d4afc6d 100644
--- a/server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
@@ -26,9 +26,6 @@ import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Func;
 import com.cloud.utils.db.SearchCriteria.Op;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Local(value = StaticRouteDao.class)
 @DB(txn = false)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/VpcDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/VpcDao.java b/server/src/com/cloud/network/vpc/Dao/VpcDao.java
index ac8b0d4..e187d74 100644
--- a/server/src/com/cloud/network/vpc/Dao/VpcDao.java
+++ b/server/src/com/cloud/network/vpc/Dao/VpcDao.java
@@ -18,9 +18,7 @@ import com.cloud.network.vpc.Vpc;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public interface VpcDao extends GenericDao<VpcVO, Long>{
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java b/server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
index e0ea5d9..c0b83e2 100644
--- a/server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
@@ -26,9 +26,6 @@ import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Func;
 import com.cloud.utils.db.SearchCriteria.Op;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Local(value = VpcDao.class)
 @DB(txn = false)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java b/server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java
index add2f42..cbc6f17 100644
--- a/server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java
+++ b/server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java
@@ -15,9 +15,7 @@ package com.cloud.network.vpc.Dao;
 import com.cloud.network.vpc.VpcGatewayVO;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public interface VpcGatewayDao extends GenericDao<VpcGatewayVO, Long>{
     VpcGatewayVO getPrivateGateway(long vpcId);
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java b/server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java
index f19ff56..64a7580 100644
--- a/server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java
@@ -21,9 +21,6 @@ import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Local(value = VpcGatewayDao.class)
 @DB(txn = false)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java b/server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java
index b5c8b47..d40bf68 100644
--- a/server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java
+++ b/server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java
@@ -15,9 +15,7 @@ package com.cloud.network.vpc.Dao;
 import com.cloud.network.vpc.VpcOfferingVO;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public interface VpcOfferingDao extends GenericDao<VpcOfferingVO, Long>{
     /**
      * Returns the VPC offering that matches the unique name.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java b/server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java
index ac6ebe7..610b1bd 100644
--- a/server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java
@@ -22,9 +22,7 @@ import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.db.Transaction;
 
-/**
- * @author Alena Prokharchyk
- */
+
 @Local(value = VpcOfferingDao.class)
 @DB(txn = false)
 public class VpcOfferingDaoImpl extends GenericDaoBase<VpcOfferingVO, Long> implements VpcOfferingDao{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java b/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java
index d9ef8a2..ad56596 100644
--- a/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java
+++ b/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java
@@ -18,9 +18,7 @@ import com.cloud.network.Network.Service;
 import com.cloud.network.vpc.VpcOfferingServiceMapVO;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public interface VpcOfferingServiceMapDao extends GenericDao<VpcOfferingServiceMapVO, Long>{
     
     List<VpcOfferingServiceMapVO> listByVpcOffId(long vpcOffId);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java b/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java
index 40aece7..7ddabde 100644
--- a/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java
@@ -25,9 +25,7 @@ import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Func;
 
-/**
- * @author Alena Prokharchyk
- */
+
 @Local(value = VpcOfferingServiceMapDao.class)
 @DB(txn = false)
 public class VpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOfferingServiceMapVO, Long> implements VpcOfferingServiceMapDao{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/NetworkACLManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManager.java b/server/src/com/cloud/network/vpc/NetworkACLManager.java
index c271bfa..92d6aac 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManager.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManager.java
@@ -19,9 +19,7 @@ import com.cloud.network.firewall.NetworkACLService;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.user.Account;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public interface NetworkACLManager extends NetworkACLService{
     
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index 66ea1d5..b8a6292 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -58,9 +58,6 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Local(value = { NetworkACLService.class, NetworkACLManager.class})
 public class NetworkACLManagerImpl implements Manager,NetworkACLManager{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java b/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java
index 62e7e22..b98c5ae 100644
--- a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java
+++ b/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java
@@ -12,9 +12,7 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.network.vpc;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public class PrivateGatewayProfile implements PrivateGateway{
     VpcGateway vpcGateway;
     long physicalNetworkId;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/PrivateIpAddress.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/PrivateIpAddress.java b/server/src/com/cloud/network/vpc/PrivateIpAddress.java
index a1755e0..d1e743e 100644
--- a/server/src/com/cloud/network/vpc/PrivateIpAddress.java
+++ b/server/src/com/cloud/network/vpc/PrivateIpAddress.java
@@ -14,9 +14,7 @@ package com.cloud.network.vpc;
 
 import com.cloud.utils.net.NetUtils;
 
-/**
- * @author Alena Prokharchyk
- */
+
 public class PrivateIpAddress implements PrivateIp{
     String vlanTag;
     String gateway;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/PrivateIpVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/PrivateIpVO.java b/server/src/com/cloud/network/vpc/PrivateIpVO.java
index b9f3142..75dd2cd 100644
--- a/server/src/com/cloud/network/vpc/PrivateIpVO.java
+++ b/server/src/com/cloud/network/vpc/PrivateIpVO.java
@@ -23,9 +23,6 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Entity
 @Table(name="private_ip_address")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/StaticRouteVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/StaticRouteVO.java b/server/src/com/cloud/network/vpc/StaticRouteVO.java
index 8859aa8..ba42dc5 100644
--- a/server/src/com/cloud/network/vpc/StaticRouteVO.java
+++ b/server/src/com/cloud/network/vpc/StaticRouteVO.java
@@ -27,9 +27,6 @@ import javax.persistence.Table;
 import com.cloud.api.Identity;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Entity
 @Table(name="static_routes")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/VpcGatewayVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcGatewayVO.java b/server/src/com/cloud/network/vpc/VpcGatewayVO.java
index 2178be3..320984d 100644
--- a/server/src/com/cloud/network/vpc/VpcGatewayVO.java
+++ b/server/src/com/cloud/network/vpc/VpcGatewayVO.java
@@ -26,9 +26,6 @@ import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Entity
 @Table(name="vpc_gateways")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/VpcManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManager.java b/server/src/com/cloud/network/vpc/VpcManager.java
index e42bf84..bc15452 100644
--- a/server/src/com/cloud/network/vpc/VpcManager.java
+++ b/server/src/com/cloud/network/vpc/VpcManager.java
@@ -27,9 +27,6 @@ import com.cloud.user.Account;
 import com.cloud.vm.DomainRouterVO;
 
 
-/**
- * @author Alena Prokharchyk
- */
 public interface VpcManager extends VpcService{
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index cab31fe..76ea216 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -96,10 +96,6 @@ import com.cloud.vm.ReservationContextImpl;
 import com.cloud.vm.dao.DomainRouterDao;
 
 
-/**
- * @author Alena Prokharchyk
- */
-
 @Local(value = { VpcManager.class, VpcService.class })
 public class VpcManagerImpl implements VpcManager, Manager{
     private static final Logger s_logger = Logger.getLogger(VpcManagerImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java b/server/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java
index ffe8533..ec1fc4a 100644
--- a/server/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java
+++ b/server/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java
@@ -25,9 +25,6 @@ import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Entity
 @Table(name="vpc_offering_service_map")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/VpcOfferingVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcOfferingVO.java b/server/src/com/cloud/network/vpc/VpcOfferingVO.java
index 2109e1c..7a708e3 100644
--- a/server/src/com/cloud/network/vpc/VpcOfferingVO.java
+++ b/server/src/com/cloud/network/vpc/VpcOfferingVO.java
@@ -26,9 +26,6 @@ import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Entity
 @Table(name="vpc_offerings")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/network/vpc/VpcVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcVO.java b/server/src/com/cloud/network/vpc/VpcVO.java
index 212a124..6baffe0 100644
--- a/server/src/com/cloud/network/vpc/VpcVO.java
+++ b/server/src/com/cloud/network/vpc/VpcVO.java
@@ -25,10 +25,6 @@ import javax.persistence.Table;
 import com.cloud.api.Identity;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
-
 @Entity
 @Table(name="vpc")
 public class VpcVO implements Vpc, Identity {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/tags/ResourceTagVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/ResourceTagVO.java b/server/src/com/cloud/tags/ResourceTagVO.java
index d5b28eb..4a4a22b 100644
--- a/server/src/com/cloud/tags/ResourceTagVO.java
+++ b/server/src/com/cloud/tags/ResourceTagVO.java
@@ -30,9 +30,6 @@ import javax.persistence.Table;
 import com.cloud.api.Identity;
 import com.cloud.server.ResourceTag;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Entity
 @Table(name="resource_tags")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
index 0386425..5676b0d 100644
--- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
+++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
@@ -65,9 +65,7 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.uuididentity.dao.IdentityDao;
 import com.cloud.vm.dao.UserVmDao;
 
-/**
- * @author Alena Prokharchyk
- */
+
 @Local(value = { TaggedResourceService.class})
 public class TaggedResourceManagerImpl implements TaggedResourceService, Manager{
     public static final Logger s_logger = Logger.getLogger(TaggedResourceManagerImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/tags/dao/ResourceTagDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/dao/ResourceTagDao.java b/server/src/com/cloud/tags/dao/ResourceTagDao.java
index 2a5c339..335c748 100644
--- a/server/src/com/cloud/tags/dao/ResourceTagDao.java
+++ b/server/src/com/cloud/tags/dao/ResourceTagDao.java
@@ -23,9 +23,6 @@ import com.cloud.server.ResourceTag.TaggedResourceType;
 import com.cloud.tags.ResourceTagVO;
 import com.cloud.utils.db.GenericDao;
 
-/**
- * @author Alena Prokharchyk
- */
 public interface ResourceTagDao extends GenericDao<ResourceTagVO, Long>{
 
     /**
@@ -37,11 +34,4 @@ public interface ResourceTagDao extends GenericDao<ResourceTagVO, Long>{
     
     List<? extends ResourceTag> listBy(long resourceId, TaggedResourceType resourceType);
 
-//    /**
-//     * @param resourceUuId
-//     * @param resourceType
-//     * @return
-//     */
-//    ResourceTag findByUuid(String resourceUuId, TaggedResourceType resourceType);
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java b/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java
index 255f940..960e03e 100644
--- a/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java
+++ b/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java
@@ -17,9 +17,7 @@
 package com.cloud.tags.dao;
 
 import java.util.List;
-
 import javax.ejb.Local;
-
 import com.cloud.server.ResourceTag;
 import com.cloud.server.ResourceTag.TaggedResourceType;
 import com.cloud.tags.ResourceTagVO;
@@ -28,9 +26,6 @@ import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Op;
 
-/**
- * @author Alena Prokharchyk
- */
 
 @Local(value = { ResourceTagDao.class })
 public class ResourceTagsDaoImpl extends GenericDaoBase<ResourceTagVO, Long> implements ResourceTagDao{
@@ -52,14 +47,6 @@ public class ResourceTagsDaoImpl extends GenericDaoBase<ResourceTagVO, Long> imp
         remove(sc);
         return true;
     }
-    
-//    @Override
-//    public ResourceTag findByUuid(String resourceUuId, ResourceTag.TaggedResourceType resourceType) {
-//        SearchCriteria<ResourceTagVO> sc = AllFieldsSearch.create();
-//        sc.setParameters("uuid", resourceUuId);
-//        sc.setParameters("resourceType", resourceType);
-//        return findOneBy(sc);
-//    }
 
     @Override
     public List<? extends ResourceTag> listBy(long resourceId, TaggedResourceType resourceType) {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/upgrade/dao/Upgrade301to302.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade301to302.java b/server/src/com/cloud/upgrade/dao/Upgrade301to302.java
index 3cbf49c..cf5c119 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade301to302.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade301to302.java
@@ -17,9 +17,6 @@
 
 package com.cloud.upgrade.dao;
 
-/**
- * @author Alena Prokharchyk
- */
 import java.io.File;
 import java.sql.Connection;
 import java.sql.PreparedStatement;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6086dc8/server/src/com/cloud/upgrade/dao/Upgrade302to303.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade302to303.java b/server/src/com/cloud/upgrade/dao/Upgrade302to303.java
index 228ef60..036a727 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade302to303.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade302to303.java
@@ -28,9 +28,6 @@ limitations under the License.*/
 
 package com.cloud.upgrade.dao;
 
-/**
- * @author Alena Prokharchyk
- */
 import java.io.File;
 import java.sql.Connection;