Index: dev-tools/idea/Intellij-Lucene-Codestyle.xml
===================================================================
--- dev-tools/idea/Intellij-Lucene-Codestyle.xml	(revision 34f16ab39137a8e63c37b30571438cb083cd326c)
+++ dev-tools/idea/Intellij-Lucene-Codestyle.xml	(revision )
@@ -1,48 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<code_scheme name="Lucene" parent="Default">
-  <option name="JAVA_INDENT_OPTIONS">
+<code_scheme name="Lucene">
+  <option name="USE_SAME_INDENTS" value="true" />
+  <option name="OTHER_INDENT_OPTIONS">
     <value>
       <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
       <option name="TAB_SIZE" value="2" />
       <option name="USE_TAB_CHARACTER" value="false" />
       <option name="SMART_TABS" value="false" />
       <option name="LABEL_INDENT_SIZE" value="0" />
       <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+      <option name="USE_RELATIVE_INDENTS" value="false" />
     </value>
   </option>
-  <option name="JSP_INDENT_OPTIONS">
-    <value>
+  <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
-      <option name="INDENT_SIZE" value="2" />
+    <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+    <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="2" />
-      <option name="USE_TAB_CHARACTER" value="false" />
-      <option name="SMART_TABS" value="false" />
-      <option name="LABEL_INDENT_SIZE" value="0" />
-      <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+    <option name="TAB_SIZE" value="2" />
+    <option name="USE_TAB_CHARACTER" value="false" />
+    <option name="SMART_TABS" value="false" />
+    <option name="LABEL_INDENT_SIZE" value="0" />
+    <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-    </value>
-  </option>
-  <option name="XML_INDENT_OPTIONS">
-    <value>
+    <option name="USE_RELATIVE_INDENTS" value="false" />
+  </ADDITIONAL_INDENT_OPTIONS>
+  <ADDITIONAL_INDENT_OPTIONS fileType="java">
-      <option name="INDENT_SIZE" value="2" />
+    <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+    <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="2" />
-      <option name="USE_TAB_CHARACTER" value="false" />
-      <option name="SMART_TABS" value="false" />
-      <option name="LABEL_INDENT_SIZE" value="0" />
-      <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+    <option name="TAB_SIZE" value="2" />
+    <option name="USE_TAB_CHARACTER" value="false" />
+    <option name="SMART_TABS" value="false" />
+    <option name="LABEL_INDENT_SIZE" value="0" />
+    <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-    </value>
-  </option>
-  <option name="OTHER_INDENT_OPTIONS">
-    <value>
+    <option name="USE_RELATIVE_INDENTS" value="false" />
+  </ADDITIONAL_INDENT_OPTIONS>
+  <ADDITIONAL_INDENT_OPTIONS fileType="xml">
-      <option name="INDENT_SIZE" value="2" />
+    <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+    <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="2" />
-      <option name="USE_TAB_CHARACTER" value="false" />
-      <option name="SMART_TABS" value="false" />
-      <option name="LABEL_INDENT_SIZE" value="0" />
-      <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+    <option name="TAB_SIZE" value="2" />
+    <option name="USE_TAB_CHARACTER" value="false" />
+    <option name="SMART_TABS" value="false" />
+    <option name="LABEL_INDENT_SIZE" value="0" />
+    <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-    </value>
-  </option>
+    <option name="USE_RELATIVE_INDENTS" value="false" />
+  </ADDITIONAL_INDENT_OPTIONS>
 </code_scheme>
 
Index: build.xml
===================================================================
--- build.xml	(revision 34f16ab39137a8e63c37b30571438cb083cd326c)
+++ build.xml	(revision )
@@ -86,8 +86,7 @@
   <condition property="isUnix"><os family="unix"/></condition>
   <condition property="isWindows"><os family="windows"/></condition>
   <property environment="env"/>
-  <target name="idea" depends="copy-idea-files,finish-idea-setup-windows,
-                               finish-idea-setup-mac, finish-idea-setup-unix" 
+  <target name="idea" depends="copy-idea-files"
           description="Setup IntelliJ IDEA configuration"/>
   <target name="copy-idea-files">
     <copy todir=".">
@@ -103,50 +102,12 @@
     <subant target="get-db-jar">
       <fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
     </subant>
-  </target>
-  <target name="finish-idea-setup-windows" if="isWindows">
     <echo>
-      To install the Lucene/Solr codestyle file, copy
-      dev-tools\idea\Intellij-Lucene-Codestyle.xml to
-      ${env.HOMEDRIVE}${env.HOMEPATH}\.IntelliJIdeaXX\config\codestyles\
-      where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
-      After restarting IntelliJ, select "Lucene"
-      from the dropdown list at:
-      Settings | Code Style | Use global settings | Scheme name
-
       To complete IntelliJ IDEA setup, you must manually configure
       Project Structure | Project | Project SDK.
     </echo>
   </target>
-  <target name="finish-idea-setup-mac" if="isMac">
-    <echo>
-      To install the Lucene/Solr codestyle file, copy
-      dev-tools/idea/Intellij-Lucene-Codestyle.xml to
-      ~/Library/Preferences/IntelliJXX/codestyles/
-      where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
-      After restarting IntelliJ, select "Lucene"
-      from the dropdown list at:
-      Settings | Code Style | Use global settings | Scheme name
-
-      To complete IntelliJ IDEA setup, you must manually configure
-      Project Structure | Project | Project SDK.
-    </echo>
-  </target>
-  <target name="finish-idea-setup-unix" if="isUnix">
-    <echo>
-      To install the Lucene/Solr codestyle file, copy
-      dev-tools/idea/Intellij-Lucene-Codestyle.xml to
-      ~/.IntelliJIdeaXX/config/codestyles/
-      where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
-      After restarting IntelliJ, select "Lucene"
-      from the dropdown list at:
-      Settings | Code Style | Use global settings | Scheme name
-
-      To complete IntelliJ IDEA setup, you must manually configure
-      Project Structure | Project | Project SDK.
-    </echo>
-  </target> 
-  <target name="clean-idea" 
+  <target name="clean-idea"
           description="Removes all IntelliJ IDEA configuration files">
     <delete dir=".idea" failonerror="true"/>
     <delete failonerror="true">
Index: dev-tools/idea/.idea/projectCodeStyle.xml
===================================================================
--- dev-tools/idea/.idea/projectCodeStyle.xml	(revision )
+++ dev-tools/idea/.idea/projectCodeStyle.xml	(revision )
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="USE_SAME_INDENTS" value="true" />
+        <option name="OTHER_INDENT_OPTIONS">
+          <value>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="TAB_SIZE" value="2" />
+            <option name="USE_TAB_CHARACTER" value="false" />
+            <option name="SMART_TABS" value="false" />
+            <option name="LABEL_INDENT_SIZE" value="0" />
+            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
+          </value>
+        </option>
+        <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          <option name="TAB_SIZE" value="2" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="java">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          <option name="TAB_SIZE" value="2" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="xml">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          <option name="TAB_SIZE" value="2" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
+