From 402dd33202d7c9333c21c7f419a32c3d4ff104b5 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Mon, 28 Sep 2015 14:31:07 +0100
Subject: [PATCH] Make indenting in `checkstyle.xml` and `import-control.xml`
 consistent

They now both use 2 spaces for indents, which is what `checkstyle.xml` was
already doing. `import.xml` had a mixture of tabs and 4 spaces previously.
---
 checkstyle/checkstyle.xml     |  18 +-
 checkstyle/import-control.xml | 330 +++++++++++++++++-----------------
 2 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 999fd6ca1dde9..cd0207cc341ff 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -17,19 +17,19 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
---> 
+-->
 <module name="Checker">
   <property name="localeLanguage" value="en"/>
-  
+
   <module name="FileTabCharacter"/>
-  
+
   <!-- header -->
   <module name="RegexpHeader">
     <property name="header" value="/\*\*\nLicensed to the Apache.*"/>
   </module>
-  
+
   <module name="TreeWalker">
-    
+
     <!-- code cleanup -->
     <module name="UnusedImports"/>
     <module name="RedundantImport"/>
@@ -39,7 +39,7 @@
     <module name="OneStatementPerLine"/>
     <module name="UnnecessaryParentheses" />
     <module name="SimplifyBooleanReturn"/>
-    
+
     <!-- style -->
     <module name="DefaultComesLast"/>
     <module name="EmptyStatement"/>
@@ -64,12 +64,12 @@
     <module name="ParameterName"/>
     <module name="StaticVariableName"/>
     <module name="TypeName"/>
-    
+
     <!-- dependencies -->
     <module name="ImportControl">
       <property name="file" value="${basedir}/checkstyle/import-control.xml"/>
     </module>
-    
+
     <!-- whitespace -->
     <module name="GenericWhitespace"/>
     <module name="NoWhitespaceBefore"/>
@@ -84,4 +84,4 @@
     <module name="ParenPad"/>
     <module name="TypecastParenPad"/>
   </module>
-</module>
\ No newline at end of file
+</module>
diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml
index db1ef7fdbb784..247f556083330 100644
--- a/checkstyle/import-control.xml
+++ b/checkstyle/import-control.xml
@@ -20,176 +20,176 @@
 
 <import-control pkg="org.apache.kafka">
 
-	<!-- THINK HARD ABOUT THE LAYERING OF THE PROJECT BEFORE CHANGING THIS FILE -->
-
-	<!-- common library dependencies -->
-	<allow pkg="java" />
-	<allow pkg="javax.management" />
-	<allow pkg="org.slf4j" />
-	<allow pkg="org.junit" />
-	<allow pkg="org.easymock" />
-	<allow pkg="org.powermock" />
-
-	<allow pkg="javax.net.ssl" />
-
-	<!-- no one depends on the server -->
-	<disallow pkg="kafka" />
-
-	<!-- anyone can use public classes -->
-	<allow pkg="org.apache.kafka.common" exact-match="true" />
-	<allow pkg="org.apache.kafka.common.utils" />
-
-	<subpackage name="common">
-		<disallow pkg="org.apache.kafka.clients" />
-		<allow pkg="org.apache.kafka.common" exact-match="true" />
-		<allow pkg="org.apache.kafka.test" />
-
-		<subpackage name="config">
-			<allow pkg="org.apache.kafka.common.config" />
-			<!-- for testing -->
-			<allow pkg="org.apache.kafka.common.metrics" />
-		</subpackage>
-
-		<subpackage name="metrics">
-			<allow pkg="org.apache.kafka.common.metrics" />
-		</subpackage>
-
-		<subpackage name="network">
-			<allow pkg="org.apache.kafka.common.security.auth" />
-			<allow pkg="org.apache.kafka.common.protocol" />
-			<allow pkg="org.apache.kafka.common.config" />
-			<allow pkg="org.apache.kafka.common.metrics" />
+  <!-- THINK HARD ABOUT THE LAYERING OF THE PROJECT BEFORE CHANGING THIS FILE -->
+
+  <!-- common library dependencies -->
+  <allow pkg="java" />
+  <allow pkg="javax.management" />
+  <allow pkg="org.slf4j" />
+  <allow pkg="org.junit" />
+  <allow pkg="org.easymock" />
+  <allow pkg="org.powermock" />
+
+  <allow pkg="javax.net.ssl" />
+
+  <!-- no one depends on the server -->
+  <disallow pkg="kafka" />
+
+  <!-- anyone can use public classes -->
+  <allow pkg="org.apache.kafka.common" exact-match="true" />
+  <allow pkg="org.apache.kafka.common.utils" />
+
+  <subpackage name="common">
+    <disallow pkg="org.apache.kafka.clients" />
+    <allow pkg="org.apache.kafka.common" exact-match="true" />
+    <allow pkg="org.apache.kafka.test" />
+
+    <subpackage name="config">
+      <allow pkg="org.apache.kafka.common.config" />
+      <!-- for testing -->
+      <allow pkg="org.apache.kafka.common.metrics" />
+    </subpackage>
+
+    <subpackage name="metrics">
+      <allow pkg="org.apache.kafka.common.metrics" />
+    </subpackage>
+
+    <subpackage name="network">
+      <allow pkg="org.apache.kafka.common.security.auth" />
+      <allow pkg="org.apache.kafka.common.protocol" />
+      <allow pkg="org.apache.kafka.common.config" />
+      <allow pkg="org.apache.kafka.common.metrics" />
       <allow pkg="org.apache.kafka.common.security" />
-		</subpackage>
+    </subpackage>
 
-		<subpackage name="security">
+    <subpackage name="security">
       <allow pkg="org.apache.kafka.common.network" />
       <allow pkg="org.apache.kafka.common.config" />
     </subpackage>
 
-		<subpackage name="protocol">
-			<allow pkg="org.apache.kafka.common.errors" />
-			<allow pkg="org.apache.kafka.common.protocol.types" />
-		</subpackage>
-
-		<subpackage name="record">
-			<allow pkg="net.jpountz" />
-			<allow pkg="org.apache.kafka.common.record" />
-		</subpackage>
-
-		<subpackage name="requests">
-			<allow pkg="org.apache.kafka.common.protocol" />
-			<allow pkg="org.apache.kafka.common.network" />
-			<!-- for testing -->
-			<allow pkg="org.apache.kafka.common.errors" />
-		</subpackage>
-
-		<subpackage name="serialization">
-			<allow class="org.apache.kafka.common.errors.SerializationException" />
-		</subpackage>
-	</subpackage>
-
-	<subpackage name="clients">
-		<allow pkg="org.slf4j" />
-		<allow pkg="org.apache.kafka.common" />
-		<allow pkg="org.apache.kafka.clients" exact-match="true"/>
-		<allow pkg="org.apache.kafka.test" />
-
-		<subpackage name="consumer">
-			<allow pkg="org.apache.kafka.clients.consumer" />
-		</subpackage>
-
-		<subpackage name="producer">
-			<allow pkg="org.apache.kafka.clients.producer" />
-		</subpackage>
-
-		<subpackage name="tools">
-			<allow pkg="org.apache.kafka.clients.producer" />
-			<allow pkg="org.apache.kafka.clients.consumer" />
-            <allow pkg="com.fasterxml.jackson" />
-            <allow pkg="net.sourceforge.argparse4j" />
-			<allow pkg="org.apache.log4j" />
-		</subpackage>
-	</subpackage>
-
-	<subpackage name="streams">
-		<allow pkg="org.apache.kafka.common"/>
-		<allow pkg="org.apache.kafka.test"/>
-		<allow pkg="org.apache.kafka.clients"/>
-		<allow pkg="org.apache.kafka.clients.producer" exact-match="true"/>
-		<allow pkg="org.apache.kafka.clients.consumer" exact-match="true"/>
-
-		<allow pkg="org.apache.kafka.streams"/>
-
-		<subpackage name="state">
-			<allow pkg="org.rocksdb" />
-		</subpackage>
-	</subpackage>
-
-	<subpackage name="log4jappender">
-		<allow pkg="org.apache.log4j" />
-		<allow pkg="org.apache.kafka.clients" />
-		<allow pkg="org.apache.kafka.common" />
-		<allow pkg="org.apache.kafka.test" />
-	</subpackage>
-
-	<subpackage name="test">
-		<allow pkg="org.apache.kafka" />
-		<allow pkg="org.bouncycastle" />
-	</subpackage>
-
-	<subpackage name="copycat">
-		<allow pkg="org.apache.kafka.common" />
-		<allow pkg="org.apache.kafka.copycat.data" />
-		<allow pkg="org.apache.kafka.copycat.errors" />
-		<allow pkg="org.apache.kafka.clients" />
-
-		<subpackage name="source">
-			<allow pkg="org.apache.kafka.copycat.connector" />
-			<allow pkg="org.apache.kafka.copycat.storage" />
-		</subpackage>
-
-		<subpackage name="sink">
-		        <allow pkg="org.apache.kafka.clients.consumer" />
-			<allow pkg="org.apache.kafka.copycat.connector" />
-			<allow pkg="org.apache.kafka.copycat.storage" />
-		</subpackage>
-
-		<subpackage name="runtime">
-			<allow pkg="org.apache.kafka.copycat" />
-		</subpackage>
-
-		<subpackage name="cli">
-			<allow pkg="org.apache.kafka.copycat.runtime" />
-			<allow pkg="org.apache.kafka.copycat.storage" />
-			<allow pkg="org.apache.kafka.copycat.util" />
-			<allow pkg="org.apache.kafka.common" />
-		</subpackage>
-
-		<subpackage name="storage">
-			<allow pkg="org.apache.kafka.copycat" />
-			<allow pkg="org.apache.kafka.common.serialization" />
-		</subpackage>
-
-		<subpackage name="util">
-			<allow pkg="org.apache.kafka.copycat" />
-		</subpackage>
-
-		<subpackage name="json">
-			<allow pkg="com.fasterxml.jackson" />
-			<allow pkg="org.apache.kafka.common.serialization" />
-			<allow pkg="org.apache.kafka.common.errors" />
-			<allow pkg="org.apache.kafka.copycat.storage" />
-		</subpackage>
-
-		<subpackage name="file">
-			<allow pkg="org.apache.kafka.copycat" />
-		        <allow pkg="org.apache.kafka.clients.consumer" />
-			<!-- for tests -->
-			<allow pkg="org.easymock" />
-			<allow pkg="org.powermock" />
-		</subpackage>
-
-	</subpackage>
+    <subpackage name="protocol">
+      <allow pkg="org.apache.kafka.common.errors" />
+      <allow pkg="org.apache.kafka.common.protocol.types" />
+    </subpackage>
+
+    <subpackage name="record">
+      <allow pkg="net.jpountz" />
+      <allow pkg="org.apache.kafka.common.record" />
+    </subpackage>
+
+    <subpackage name="requests">
+      <allow pkg="org.apache.kafka.common.protocol" />
+      <allow pkg="org.apache.kafka.common.network" />
+      <!-- for testing -->
+      <allow pkg="org.apache.kafka.common.errors" />
+    </subpackage>
+
+    <subpackage name="serialization">
+      <allow class="org.apache.kafka.common.errors.SerializationException" />
+    </subpackage>
+  </subpackage>
+
+  <subpackage name="clients">
+    <allow pkg="org.slf4j" />
+    <allow pkg="org.apache.kafka.common" />
+    <allow pkg="org.apache.kafka.clients" exact-match="true"/>
+    <allow pkg="org.apache.kafka.test" />
+
+    <subpackage name="consumer">
+      <allow pkg="org.apache.kafka.clients.consumer" />
+    </subpackage>
+
+    <subpackage name="producer">
+      <allow pkg="org.apache.kafka.clients.producer" />
+    </subpackage>
+
+    <subpackage name="tools">
+      <allow pkg="org.apache.kafka.clients.producer" />
+      <allow pkg="org.apache.kafka.clients.consumer" />
+      <allow pkg="com.fasterxml.jackson" />
+      <allow pkg="net.sourceforge.argparse4j" />
+      <allow pkg="org.apache.log4j" />
+    </subpackage>
+  </subpackage>
+
+  <subpackage name="streams">
+    <allow pkg="org.apache.kafka.common"/>
+    <allow pkg="org.apache.kafka.test"/>
+    <allow pkg="org.apache.kafka.clients"/>
+    <allow pkg="org.apache.kafka.clients.producer" exact-match="true"/>
+    <allow pkg="org.apache.kafka.clients.consumer" exact-match="true"/>
+
+    <allow pkg="org.apache.kafka.streams"/>
+
+    <subpackage name="state">
+      <allow pkg="org.rocksdb" />
+    </subpackage>
+  </subpackage>
+
+  <subpackage name="log4jappender">
+    <allow pkg="org.apache.log4j" />
+    <allow pkg="org.apache.kafka.clients" />
+    <allow pkg="org.apache.kafka.common" />
+    <allow pkg="org.apache.kafka.test" />
+  </subpackage>
+
+  <subpackage name="test">
+    <allow pkg="org.apache.kafka" />
+    <allow pkg="org.bouncycastle" />
+  </subpackage>
+
+  <subpackage name="copycat">
+    <allow pkg="org.apache.kafka.common" />
+    <allow pkg="org.apache.kafka.copycat.data" />
+    <allow pkg="org.apache.kafka.copycat.errors" />
+    <allow pkg="org.apache.kafka.clients" />
+
+    <subpackage name="source">
+      <allow pkg="org.apache.kafka.copycat.connector" />
+      <allow pkg="org.apache.kafka.copycat.storage" />
+    </subpackage>
+
+    <subpackage name="sink">
+      <allow pkg="org.apache.kafka.clients.consumer" />
+      <allow pkg="org.apache.kafka.copycat.connector" />
+      <allow pkg="org.apache.kafka.copycat.storage" />
+    </subpackage>
+
+    <subpackage name="runtime">
+      <allow pkg="org.apache.kafka.copycat" />
+    </subpackage>
+
+    <subpackage name="cli">
+      <allow pkg="org.apache.kafka.copycat.runtime" />
+      <allow pkg="org.apache.kafka.copycat.storage" />
+      <allow pkg="org.apache.kafka.copycat.util" />
+      <allow pkg="org.apache.kafka.common" />
+    </subpackage>
+
+    <subpackage name="storage">
+      <allow pkg="org.apache.kafka.copycat" />
+      <allow pkg="org.apache.kafka.common.serialization" />
+    </subpackage>
+
+    <subpackage name="util">
+      <allow pkg="org.apache.kafka.copycat" />
+    </subpackage>
+
+    <subpackage name="json">
+      <allow pkg="com.fasterxml.jackson" />
+      <allow pkg="org.apache.kafka.common.serialization" />
+      <allow pkg="org.apache.kafka.common.errors" />
+      <allow pkg="org.apache.kafka.copycat.storage" />
+    </subpackage>
+
+    <subpackage name="file">
+      <allow pkg="org.apache.kafka.copycat" />
+      <allow pkg="org.apache.kafka.clients.consumer" />
+      <!-- for tests -->
+      <allow pkg="org.easymock" />
+      <allow pkg="org.powermock" />
+    </subpackage>
+
+  </subpackage>
 
 </import-control>