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:10 UTC
[1/4] activemq-artemis git commit: This closes #830
Repository: activemq-artemis
Updated Branches:
refs/heads/master 15f44d60d -> 30809c081
This closes #830
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/30809c08
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/30809c08
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/30809c08
Branch: refs/heads/master
Commit: 30809c081d9c7080d75d7f5d7a1e74b63414b014
Parents: 15f44d6 1b67ac6
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Oct 10 10:01:01 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 10 10:01:01 2016 +0200
----------------------------------------------------------------------
.gitignore | 1 +
docs/hacking-guide/en/formatting.md | 10 +++++++++-
etc/ide-settings/editorconfig.ini | 11 +++++++++++
pom.xml | 3 +--
4 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/4] activemq-artemis git commit: Fix hacking-guide/formatting
subheadings
Posted by cl...@apache.org.
Fix hacking-guide/formatting subheadings
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1b67ac69
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1b67ac69
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1b67ac69
Branch: refs/heads/master
Commit: 1b67ac6928da7098fd61a0863f5aae6bd26bc1ae
Parents: b7b3ff7
Author: Ville Skytt� <vi...@iki.fi>
Authored: Sat Oct 8 11:43:20 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 10 10:01:01 2016 +0200
----------------------------------------------------------------------
docs/hacking-guide/en/formatting.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b67ac69/docs/hacking-guide/en/formatting.md
----------------------------------------------------------------------
diff --git a/docs/hacking-guide/en/formatting.md b/docs/hacking-guide/en/formatting.md
index 6b6469b..63b307c 100644
--- a/docs/hacking-guide/en/formatting.md
+++ b/docs/hacking-guide/en/formatting.md
@@ -1,5 +1,7 @@
# Code Formatting
+## Eclipse
+
Eclipse code formatting and (basic) project configuration files can be found at the `etc/` folder. You should manually
copy them _after importing all your projects_:
@@ -10,11 +12,11 @@ copy them _after importing all your projects_:
Do not use the [maven-eclipse-plugin](https://maven.apache.org/plugins/maven-eclipse-plugin/) to copy the files as it
conflicts with [m2e](http://eclipse.org/m2e/).
-# Idea
+## 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
+## 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
[2/4] activemq-artemis git commit: Remove some redundant rat-plugin
exclusions
Posted by cl...@apache.org.
Remove some redundant rat-plugin exclusions
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b7b3ff7f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b7b3ff7f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b7b3ff7f
Branch: refs/heads/master
Commit: b7b3ff7f31c9766484a7d845233cfda8a032fa65
Parents: b2fe246
Author: Ville Skytt� <vi...@iki.fi>
Authored: Sat Oct 8 11:38:30 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 10 10:01:01 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b7b3ff7f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 96c1187..b1c81ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1272,7 +1272,6 @@
<exclude>**/.editorconfig</exclude>
<exclude>**/.checkstyle</exclude>
<exclude>**/.factorypath</exclude>
- <exclude>ratReport.txt</exclude>
<exclude>**/org.apache.activemq.artemis.cfg</exclude>
<!-- activemq5 unit tests exclude -->
<exclude>**/*.data</exclude>
@@ -1288,7 +1287,6 @@
<exclude>**/npm-shrinkwrap.json</exclude>
<!-- things from cmake on the native build -->
- <exclude>**/CMakeCache.txt</exclude>
<exclude>**/CMakeFiles/</exclude>
<exclude>**/Makefile</exclude>
<exclude>**/cmake_install.cmake</exclude>
[4/4] activemq-artemis git commit: Add EditorConfig
Posted by cl...@apache.org.
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>