From 87c3f23e88d435dbd802fdeca852421d0d7e2d7d Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Tue, 6 Sep 2016 10:47:48 -0400 Subject: [PATCH] ignoring IDE settings from the source distribution --- .../src/main/assembly/source-assembly.xml | 3 +++ docs/hacking-guide/en/ide.md | 6 +++++- etc/{ => ide-settings}/IDEA-style.jar | Bin etc/ide-settings/README.md | 6 ++++++ etc/{ => ide-settings}/org.eclipse.jdt.core.prefs | 0 etc/{ => ide-settings}/org.eclipse.jdt.ui.prefs | 0 pom.xml | 2 +- 7 files changed, 15 insertions(+), 2 deletions(-) rename etc/{ => ide-settings}/IDEA-style.jar (100%) create mode 100644 etc/ide-settings/README.md rename etc/{ => ide-settings}/org.eclipse.jdt.core.prefs (100%) rename etc/{ => ide-settings}/org.eclipse.jdt.ui.prefs (100%) diff --git a/artemis-distribution/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml index 1e3ce0da69..16afcd531f 100644 --- a/artemis-distribution/src/main/assembly/source-assembly.xml +++ b/artemis-distribution/src/main/assembly/source-assembly.xml @@ -42,6 +42,9 @@ data/ + + etc/ide-settings/ + docs/diagrams/ diff --git a/docs/hacking-guide/en/ide.md b/docs/hacking-guide/en/ide.md index c96ccef61c..d292c732de 100644 --- a/docs/hacking-guide/en/ide.md +++ b/docs/hacking-guide/en/ide.md @@ -1,5 +1,9 @@ # IDE Integration +There a few files useful for IDE integration under ./etc/ide-settings on a checked out folder. This folder is not part of the source distribution can it can be easily obtained: + +- https://github.com/apache/activemq-artemis/tree/master/etc/ide-settings + ## IntelliJ IDEA ### Importing the Project @@ -37,7 +41,7 @@ There's a [SOF Question](http://stackoverflow.com/questions/27906481/can-intelli We have shared the style templates that are good for this project. If you want to apply them use these steps: * File->Import Settings -* Select the file under ./artemis-cloned-folder/etc/IDEA-style.jar +* Select the file under ./artemis-cloned-folder/etc/ide-settings/IDEA-style.jar * Select both Code Style Templates and File templates (it's the default option) * Select OK and restart Idea diff --git a/etc/IDEA-style.jar b/etc/ide-settings/IDEA-style.jar similarity index 100% rename from etc/IDEA-style.jar rename to etc/ide-settings/IDEA-style.jar diff --git a/etc/ide-settings/README.md b/etc/ide-settings/README.md new file mode 100644 index 0000000000..4e71386a0d --- /dev/null +++ b/etc/ide-settings/README.md @@ -0,0 +1,6 @@ +## IDE Files + + +Include any files that are specific to IDE such as settings, etc. + +These directory is ignored from the source release, so they will only be available through the source repository checkout or clone. \ No newline at end of file diff --git a/etc/org.eclipse.jdt.core.prefs b/etc/ide-settings/org.eclipse.jdt.core.prefs similarity index 100% rename from etc/org.eclipse.jdt.core.prefs rename to etc/ide-settings/org.eclipse.jdt.core.prefs diff --git a/etc/org.eclipse.jdt.ui.prefs b/etc/ide-settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from etc/org.eclipse.jdt.ui.prefs rename to etc/ide-settings/org.eclipse.jdt.ui.prefs diff --git a/pom.xml b/pom.xml index 26dfb39972..1b1ec97cc5 100644 --- a/pom.xml +++ b/pom.xml @@ -1154,7 +1154,7 @@ **/*.txt **/*.md - etc/org.eclipse.* + etc/ide-settings/* docs/**/*.json docs/**/_book/ **/target/