http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
----------------------------------------------------------------------
diff --git 
a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java 
b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
index 59d2e8e..3755353 100644
--- a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
@@ -19,14 +19,16 @@ package org.apache.cloudstack.api.command.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.mockito.Matchers;
 import org.mockito.Mockito;
 
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd;
+
 import com.cloud.network.VpnUser;
 import com.cloud.network.vpn.RemoteAccessVpnService;
 import com.cloud.user.Account;
@@ -39,6 +41,7 @@ public class AddVpnUserCmdTest extends TestCase {
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
+    @Override
     @Before
     public void setUp() {
 
@@ -99,14 +102,14 @@ public class AddVpnUserCmdTest extends TestCase {
         AccountService accountService = Mockito.mock(AccountService.class);
 
         Account account = Mockito.mock(Account.class);
-        
Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(account);
+        
Mockito.when(accountService.getAccount(Matchers.anyLong())).thenReturn(account);
 
         addVpnUserCmd._accountService = accountService;
 
         RemoteAccessVpnService ravService = 
Mockito.mock(RemoteAccessVpnService.class);
 
         VpnUser vpnUser = Mockito.mock(VpnUser.class);
-        Mockito.when(ravService.addVpnUser(Mockito.anyLong(), 
Mockito.anyString(), Mockito.anyString())).thenReturn(vpnUser);
+        Mockito.when(ravService.addVpnUser(Matchers.anyLong(), 
Matchers.anyString(), Matchers.anyString())).thenReturn(vpnUser);
 
         addVpnUserCmd._ravService = ravService;
 
@@ -119,12 +122,12 @@ public class AddVpnUserCmdTest extends TestCase {
 
         AccountService accountService = Mockito.mock(AccountService.class);
         Account account = Mockito.mock(Account.class);
-        
Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(account);
+        
Mockito.when(accountService.getAccount(Matchers.anyLong())).thenReturn(account);
 
         addVpnUserCmd._accountService = accountService;
 
         RemoteAccessVpnService ravService = 
Mockito.mock(RemoteAccessVpnService.class);
-        Mockito.when(ravService.addVpnUser(Mockito.anyLong(), 
Mockito.anyString(), Mockito.anyString())).thenReturn(null);
+        Mockito.when(ravService.addVpnUser(Matchers.anyLong(), 
Matchers.anyString(), Matchers.anyString())).thenReturn(null);
 
         addVpnUserCmd._ravService = ravService;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
----------------------------------------------------------------------
diff --git 
a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java 
b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
index b838946..6b56591 100644
--- a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
@@ -16,30 +16,26 @@
 // under the License.
 package org.apache.cloudstack.api.command.test;
 
-import com.cloud.configuration.ConfigurationService;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.resource.ResourceService;
-import com.cloud.server.ManagementService;
-import com.cloud.utils.Pair;
+import java.util.ArrayList;
+import java.util.List;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.ResponseGenerator;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
-import org.apache.cloudstack.api.response.ConfigurationResponse;
-import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.config.Configuration;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
+import org.apache.cloudstack.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.config.Configuration;
+
+import com.cloud.server.ManagementService;
+import com.cloud.utils.Pair;
 
 public class ListCfgCmdTest extends TestCase {
 
@@ -50,6 +46,7 @@ public class ListCfgCmdTest extends TestCase {
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
+    @Override
     @Before
     public void setUp() {
         responseGenerator = Mockito.mock(ResponseGenerator.class);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java 
b/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
index 9ed4752..10c3d85 100644
--- a/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
@@ -19,17 +19,19 @@ package org.apache.cloudstack.api.command.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.admin.region.AddRegionCmd;
 import org.apache.cloudstack.api.response.RegionResponse;
 import org.apache.cloudstack.region.Region;
 import org.apache.cloudstack.region.RegionService;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mockito;
 
 public class RegionCmdTest extends TestCase {
 
@@ -39,6 +41,7 @@ public class RegionCmdTest extends TestCase {
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
+    @Override
     @Before
     public void setUp() {
 
@@ -63,7 +66,7 @@ public class RegionCmdTest extends TestCase {
         RegionService regionService = Mockito.mock(RegionService.class);
 
         Region region = Mockito.mock(Region.class);
-        Mockito.when(regionService.addRegion(Mockito.anyInt(), 
Mockito.anyString(), Mockito.anyString())).thenReturn(region);
+        Mockito.when(regionService.addRegion(Matchers.anyInt(), 
Matchers.anyString(), Matchers.anyString())).thenReturn(region);
 
         addRegionCmd._regionService = regionService;
         responseGenerator = Mockito.mock(ResponseGenerator.class);
@@ -83,7 +86,7 @@ public class RegionCmdTest extends TestCase {
         RegionService regionService = Mockito.mock(RegionService.class);
 
         Region region = Mockito.mock(Region.class);
-        Mockito.when(regionService.addRegion(Mockito.anyInt(), 
Mockito.anyString(), Mockito.anyString())).thenReturn(null);
+        Mockito.when(regionService.addRegion(Matchers.anyInt(), 
Matchers.anyString(), Matchers.anyString())).thenReturn(null);
 
         addRegionCmd._regionService = regionService;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
----------------------------------------------------------------------
diff --git 
a/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java 
b/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
index 7c6f492..0c03e39 100644
--- a/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
@@ -16,22 +16,25 @@
 // under the License.
 package org.apache.cloudstack.api.command.test;
 
-import com.cloud.uservm.UserVm;
-import com.cloud.vm.UserVmService;
+import java.util.LinkedList;
+import java.util.List;
+
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import org.apache.cloudstack.api.ResponseGenerator;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd;
 
-import org.apache.cloudstack.api.response.UserVmResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
-import java.util.LinkedList;
-import java.util.List;
+
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd;
+import org.apache.cloudstack.api.response.UserVmResponse;
+
+import com.cloud.uservm.UserVm;
+import com.cloud.vm.UserVmService;
 
 public class ScaleVMCmdTest extends TestCase {
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
----------------------------------------------------------------------
diff --git 
a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java 
b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
index 5a860cd..a07608a 100644
--- a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
@@ -16,24 +16,23 @@
 // under the License.
 package org.apache.cloudstack.api.command.test;
 
-import com.cloud.configuration.ConfigurationService;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.resource.ResourceService;
-
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
 import org.apache.cloudstack.api.response.ConfigurationResponse;
 import org.apache.cloudstack.config.Configuration;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mockito;
+import com.cloud.configuration.ConfigurationService;
+import com.cloud.exception.InvalidParameterValueException;
 
 public class UpdateCfgCmdTest extends TestCase {
 
@@ -44,6 +43,7 @@ public class UpdateCfgCmdTest extends TestCase {
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
+    @Override
     @Before
     public void setUp() {
         responseGenerator = Mockito.mock(ResponseGenerator.class);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java 
b/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
index ca31eda..cadf275 100644
--- a/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
@@ -21,15 +21,16 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.command.admin.usage.GetUsageRecordsCmd;
-import org.apache.cloudstack.usage.Usage;
-import org.apache.cloudstack.usage.UsageService;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
 
+import org.apache.cloudstack.api.command.admin.usage.GetUsageRecordsCmd;
+import org.apache.cloudstack.usage.Usage;
+import org.apache.cloudstack.usage.UsageService;
+
 import com.cloud.utils.Pair;
 
 public class UsageCmdTest extends TestCase {
@@ -39,6 +40,7 @@ public class UsageCmdTest extends TestCase {
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
+    @Override
     @Before
     public void setUp() {
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ActivateLicense.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicense.java 
b/awsapi/src/com/amazon/ec2/ActivateLicense.java
index 11fda56..296e581 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicense.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicense.java
@@ -98,7 +98,8 @@ public class ActivateLicense implements 
org.apache.axis2.databinding.ADBBean {
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -118,9 +119,8 @@ public class ActivateLicense implements 
org.apache.axis2.databinding.ADBBean {
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ActivateLicense implements 
org.apache.axis2.databinding.ADBBean {
                 while (!reader.isEndElement()) {
                     if (reader.isStartElement()) {
 
-                        if (reader.isStartElement() && new 
javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/";, 
"ActivateLicense").equals(reader.getName())) {
+                        if (reader.isStartElement() &&
+                            new 
javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/";, 
"ActivateLicense").equals(reader.getName())) {
 
                             
object.setActivateLicense(com.amazon.ec2.ActivateLicenseType.Factory.parse(reader));
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java 
b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
index 512d741..ad3f4be 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
@@ -98,7 +98,8 @@ public class ActivateLicenseResponse implements 
org.apache.axis2.databinding.ADB
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -118,9 +119,8 @@ public class ActivateLicenseResponse implements 
org.apache.axis2.databinding.ADB
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java 
b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
index 2810f79..02d73d5 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
@@ -125,7 +125,8 @@ public class ActivateLicenseResponseType implements 
org.apache.axis2.databinding
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -235,9 +236,8 @@ public class ActivateLicenseResponseType implements 
org.apache.axis2.databinding
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java 
b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
index 445683c..5e7f5c3 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
@@ -125,7 +125,8 @@ public class ActivateLicenseType implements 
org.apache.axis2.databinding.ADBBean
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -235,9 +236,8 @@ public class ActivateLicenseType implements 
org.apache.axis2.databinding.ADBBean
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddress.java 
b/awsapi/src/com/amazon/ec2/AllocateAddress.java
index 4c5ac3b..185f43d 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddress.java
@@ -98,7 +98,8 @@ public class AllocateAddress implements 
org.apache.axis2.databinding.ADBBean {
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -118,9 +119,8 @@ public class AllocateAddress implements 
org.apache.axis2.databinding.ADBBean {
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AllocateAddress implements 
org.apache.axis2.databinding.ADBBean {
                 while (!reader.isEndElement()) {
                     if (reader.isStartElement()) {
 
-                        if (reader.isStartElement() && new 
javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/";, 
"AllocateAddress").equals(reader.getName())) {
+                        if (reader.isStartElement() &&
+                            new 
javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/";, 
"AllocateAddress").equals(reader.getName())) {
 
                             
object.setAllocateAddress(com.amazon.ec2.AllocateAddressType.Factory.parse(reader));
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java 
b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
index 76801a4..bfec997 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
@@ -98,7 +98,8 @@ public class AllocateAddressResponse implements 
org.apache.axis2.databinding.ADB
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -118,9 +119,8 @@ public class AllocateAddressResponse implements 
org.apache.axis2.databinding.ADB
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java 
b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
index e0e4e64..57aa866 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
@@ -187,7 +187,8 @@ public class AllocateAddressResponseType implements 
org.apache.axis2.databinding
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -364,9 +365,8 @@ public class AllocateAddressResponseType implements 
org.apache.axis2.databinding
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressType.java 
b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
index 5127044..52b183c 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
@@ -115,7 +115,8 @@ public class AllocateAddressType implements 
org.apache.axis2.databinding.ADBBean
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -196,9 +197,8 @@ public class AllocateAddressType implements 
org.apache.axis2.databinding.ADBBean
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java 
b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
index 720cd34..5777160 100644
--- a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
@@ -101,7 +101,8 @@ public class AllocationIdSetItemType implements 
org.apache.axis2.databinding.ADB
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -182,9 +183,8 @@ public class AllocationIdSetItemType implements 
org.apache.axis2.databinding.ADB
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java 
b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
index d029139..d7bfad9 100644
--- a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
@@ -142,7 +142,8 @@ public class AllocationIdSetType implements 
org.apache.axis2.databinding.ADBBean
     }
 
     public void serialize(final javax.xml.namespace.QName parentQName, final 
org.apache.axiom.om.OMFactory factory,
-        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException, 
org.apache.axis2.databinding.ADBException {
+        org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter 
xmlWriter) throws javax.xml.stream.XMLStreamException,
+        org.apache.axis2.databinding.ADBException {
         serialize(parentQName, factory, xmlWriter, false);
     }
 
@@ -208,9 +209,8 @@ public class AllocationIdSetType implements 
org.apache.axis2.databinding.ADBBean
     /**
      * Util method to write an attribute with the ns prefix
      */
-    private void
-        writeAttribute(java.lang.String prefix, java.lang.String namespace, 
java.lang.String attName, java.lang.String attValue, 
javax.xml.stream.XMLStreamWriter xmlWriter)
-            throws javax.xml.stream.XMLStreamException {
+    private void writeAttribute(java.lang.String prefix, java.lang.String 
namespace, java.lang.String attName, java.lang.String attValue,
+        javax.xml.stream.XMLStreamWriter xmlWriter) throws 
javax.xml.stream.XMLStreamException {
         if (xmlWriter.getPrefix(namespace) == null) {
             xmlWriter.writeNamespace(prefix, namespace);
             xmlWriter.setPrefix(prefix, namespace);

Reply via email to