You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/10/10 08:01:13 UTC
[4/4] activemq-artemis git commit: Add EditorConfig
Add EditorConfig
http://editorconfig.org/
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b2fe246e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b2fe246e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b2fe246e
Branch: refs/heads/master
Commit: b2fe246e62762410b3b48a5cb0eda0e0da229649
Parents: 15f44d6
Author: Ville Skytt� <vi...@iki.fi>
Authored: Sat Oct 8 11:37:56 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 10 10:01:01 2016 +0200
----------------------------------------------------------------------
.gitignore | 1 +
docs/hacking-guide/en/formatting.md | 6 ++++++
etc/ide-settings/editorconfig.ini | 11 +++++++++++
pom.xml | 1 +
4 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b2fe246e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 820c732..4fbf4a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ ratReport.txt
.settings
.checkstyle
.factorypath
+**/.editorconfig
**/derby.log
# for native build
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b2fe246e/docs/hacking-guide/en/formatting.md
----------------------------------------------------------------------
diff --git a/docs/hacking-guide/en/formatting.md b/docs/hacking-guide/en/formatting.md
index daec275..6b6469b 100644
--- a/docs/hacking-guide/en/formatting.md
+++ b/docs/hacking-guide/en/formatting.md
@@ -13,3 +13,9 @@ conflicts with [m2e](http://eclipse.org/m2e/).
# Idea
If you completed the step described on [idea instructions](ide.md#style-templates-and-inspection-settings-for-idea), and selected the code style accordingly you should be ready to go.
+
+# EditorConfig
+
+For editors supporting [EditorConfig](http://editorconfig.org/), a settings file is provided in
+etc/ide-settings/editorconfig.ini. Copy it to your Artemis top level directory and
+[name it .editorconfig](http://editorconfig.org/#file-location)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b2fe246e/etc/ide-settings/editorconfig.ini
----------------------------------------------------------------------
diff --git a/etc/ide-settings/editorconfig.ini b/etc/ide-settings/editorconfig.ini
new file mode 100644
index 0000000..874dc21
--- /dev/null
+++ b/etc/ide-settings/editorconfig.ini
@@ -0,0 +1,11 @@
+# Copy to your Artemis top level dir and rename to .editorconfig
+# http://editorconfig.org/#file-location
+
+[*.{java,xml}]
+indent_style = space
+indent_size = 3
+tab_width = 3
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b2fe246e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e39d82c..96c1187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1269,6 +1269,7 @@
<exclude>**/.settings/**</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
+ <exclude>**/.editorconfig</exclude>
<exclude>**/.checkstyle</exclude>
<exclude>**/.factorypath</exclude>
<exclude>ratReport.txt</exclude>