From 54008d4e0038999522563703c023395bdb14c29b Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Thu, 13 Apr 2017 07:17:20 +0200 Subject: [PATCH 1/2] Add Eclipse metadata * .project * .classpath * .settings/*.prefs --- .gitignore | 5 --- .project | 28 +++++++++++++++ .settings/org.eclipse.core.resources.prefs | 2 ++ .../scout-boot-archetype-minimal/.classpath | 19 ++++++++++ .../scout-boot-archetype-minimal/.project | 23 ++++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ scout-boot-platform/.classpath | 36 +++++++++++++++++++ scout-boot-platform/.project | 23 ++++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ scout-boot-ui-dev/.classpath | 36 +++++++++++++++++++ scout-boot-ui-dev/.project | 23 ++++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ scout-boot-ui-security/.classpath | 36 +++++++++++++++++++ scout-boot-ui-security/.project | 23 ++++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ scout-boot-ui/.classpath | 36 +++++++++++++++++++ scout-boot-ui/.project | 23 ++++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ 18 files changed, 318 insertions(+), 5 deletions(-) create mode 100644 .project create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 archetype/scout-boot-archetype-minimal/.classpath create mode 100644 archetype/scout-boot-archetype-minimal/.project create mode 100644 archetype/scout-boot-archetype-minimal/.settings/org.eclipse.core.resources.prefs create mode 100644 scout-boot-platform/.classpath create mode 100644 scout-boot-platform/.project create mode 100644 scout-boot-platform/.settings/org.eclipse.core.resources.prefs create mode 100644 scout-boot-ui-dev/.classpath create mode 100644 scout-boot-ui-dev/.project create mode 100644 scout-boot-ui-dev/.settings/org.eclipse.core.resources.prefs create mode 100644 scout-boot-ui-security/.classpath create mode 100644 scout-boot-ui-security/.project create mode 100644 scout-boot-ui-security/.settings/org.eclipse.core.resources.prefs create mode 100644 scout-boot-ui/.classpath create mode 100644 scout-boot-ui/.project create mode 100644 scout-boot-ui/.settings/org.eclipse.core.resources.prefs diff --git a/.gitignore b/.gitignore index a478b2d..2aa722e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,11 +5,6 @@ hs_err_pid* *.war *.ear -# Eclipse -.classpath -.project -.settings/ - # Maven log/ target/ diff --git a/.project b/.project new file mode 100644 index 0000000..e13b178 --- /dev/null +++ b/.project @@ -0,0 +1,28 @@ + + + ScoutBoot + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + + + 1492060417956 + + 26 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-scout-boot* + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/archetype/scout-boot-archetype-minimal/.classpath b/archetype/scout-boot-archetype-minimal/.classpath new file mode 100644 index 0000000..967f798 --- /dev/null +++ b/archetype/scout-boot-archetype-minimal/.classpath @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/archetype/scout-boot-archetype-minimal/.project b/archetype/scout-boot-archetype-minimal/.project new file mode 100644 index 0000000..6d505b7 --- /dev/null +++ b/archetype/scout-boot-archetype-minimal/.project @@ -0,0 +1,23 @@ + + + scout-boot-archetype-minimal + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/archetype/scout-boot-archetype-minimal/.settings/org.eclipse.core.resources.prefs b/archetype/scout-boot-archetype-minimal/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/archetype/scout-boot-archetype-minimal/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/scout-boot-platform/.classpath b/scout-boot-platform/.classpath new file mode 100644 index 0000000..291c321 --- /dev/null +++ b/scout-boot-platform/.classpath @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scout-boot-platform/.project b/scout-boot-platform/.project new file mode 100644 index 0000000..ef08390 --- /dev/null +++ b/scout-boot-platform/.project @@ -0,0 +1,23 @@ + + + scout-boot-platform + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/scout-boot-platform/.settings/org.eclipse.core.resources.prefs b/scout-boot-platform/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/scout-boot-platform/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/scout-boot-ui-dev/.classpath b/scout-boot-ui-dev/.classpath new file mode 100644 index 0000000..291c321 --- /dev/null +++ b/scout-boot-ui-dev/.classpath @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scout-boot-ui-dev/.project b/scout-boot-ui-dev/.project new file mode 100644 index 0000000..4ef3944 --- /dev/null +++ b/scout-boot-ui-dev/.project @@ -0,0 +1,23 @@ + + + scout-boot-ui-dev + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/scout-boot-ui-dev/.settings/org.eclipse.core.resources.prefs b/scout-boot-ui-dev/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/scout-boot-ui-dev/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/scout-boot-ui-security/.classpath b/scout-boot-ui-security/.classpath new file mode 100644 index 0000000..291c321 --- /dev/null +++ b/scout-boot-ui-security/.classpath @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scout-boot-ui-security/.project b/scout-boot-ui-security/.project new file mode 100644 index 0000000..76cee89 --- /dev/null +++ b/scout-boot-ui-security/.project @@ -0,0 +1,23 @@ + + + scout-boot-ui-security + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/scout-boot-ui-security/.settings/org.eclipse.core.resources.prefs b/scout-boot-ui-security/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/scout-boot-ui-security/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/scout-boot-ui/.classpath b/scout-boot-ui/.classpath new file mode 100644 index 0000000..291c321 --- /dev/null +++ b/scout-boot-ui/.classpath @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scout-boot-ui/.project b/scout-boot-ui/.project new file mode 100644 index 0000000..a93254c --- /dev/null +++ b/scout-boot-ui/.project @@ -0,0 +1,23 @@ + + + scout-boot-ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/scout-boot-ui/.settings/org.eclipse.core.resources.prefs b/scout-boot-ui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/scout-boot-ui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 From 15a936d2be1a91fe7dfa6d63d3bee4de46392f38 Mon Sep 17 00:00:00 2001 From: Michael Schmuki Date: Fri, 8 Dec 2017 12:39:08 +0100 Subject: [PATCH 2/2] Cleanup Eclipse Metadata - Add Standard-Archetype (Rebase) and Remove Java-Nature from Min.-Arch. - Force Java 8 on all Projects - Apply Project Hierarchy from eclipse:eclipse (see Project Explorer) - Remove unused .classpath in Min.-Arch. - Remove all .settings file - Encode all files in UTF-8 --- .gitignore | 3 + .project | 13 +-- .settings/org.eclipse.core.resources.prefs | 2 - .../scout-boot-archetype-minimal/.classpath | 19 ----- .../scout-boot-archetype-minimal/.project | 6 -- .../org.eclipse.core.resources.prefs | 2 - .../scout-boot-archetype-standard/.project | 17 ++++ scout-boot-platform/.classpath | 71 +++++++++-------- .../org.eclipse.core.resources.prefs | 2 - scout-boot-ui-dev/.classpath | 73 +++++++++-------- scout-boot-ui-dev/.project | 2 + .../org.eclipse.core.resources.prefs | 2 - scout-boot-ui-security/.classpath | 79 +++++++++++-------- scout-boot-ui-security/.project | 2 + .../org.eclipse.core.resources.prefs | 2 - scout-boot-ui/.classpath | 78 ++++++++++-------- scout-boot-ui/.project | 1 + .../org.eclipse.core.resources.prefs | 2 - 18 files changed, 195 insertions(+), 181 deletions(-) delete mode 100644 .settings/org.eclipse.core.resources.prefs delete mode 100644 archetype/scout-boot-archetype-minimal/.classpath delete mode 100644 archetype/scout-boot-archetype-minimal/.settings/org.eclipse.core.resources.prefs create mode 100644 archetype/scout-boot-archetype-standard/.project delete mode 100644 scout-boot-platform/.settings/org.eclipse.core.resources.prefs delete mode 100644 scout-boot-ui-dev/.settings/org.eclipse.core.resources.prefs delete mode 100644 scout-boot-ui-security/.settings/org.eclipse.core.resources.prefs delete mode 100644 scout-boot-ui/.settings/org.eclipse.core.resources.prefs diff --git a/.gitignore b/.gitignore index 2aa722e..8241336 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ hs_err_pid* *.war *.ear +# Eclipse +.settings/ + # Maven log/ target/ diff --git a/.project b/.project index e13b178..23acc9b 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - ScoutBoot + scout-boot @@ -14,15 +14,4 @@ org.eclipse.m2e.core.maven2Nature - - - 1492060417956 - - 26 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-scout-boot* - - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/archetype/scout-boot-archetype-minimal/.classpath b/archetype/scout-boot-archetype-minimal/.classpath deleted file mode 100644 index 967f798..0000000 --- a/archetype/scout-boot-archetype-minimal/.classpath +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/archetype/scout-boot-archetype-minimal/.project b/archetype/scout-boot-archetype-minimal/.project index 6d505b7..41ea340 100644 --- a/archetype/scout-boot-archetype-minimal/.project +++ b/archetype/scout-boot-archetype-minimal/.project @@ -5,11 +5,6 @@ - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.m2e.core.maven2Builder @@ -18,6 +13,5 @@ org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature diff --git a/archetype/scout-boot-archetype-minimal/.settings/org.eclipse.core.resources.prefs b/archetype/scout-boot-archetype-minimal/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/archetype/scout-boot-archetype-minimal/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/archetype/scout-boot-archetype-standard/.project b/archetype/scout-boot-archetype-standard/.project new file mode 100644 index 0000000..705dea5 --- /dev/null +++ b/archetype/scout-boot-archetype-standard/.project @@ -0,0 +1,17 @@ + + + scout-boot-archetype-standard + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/scout-boot-platform/.classpath b/scout-boot-platform/.classpath index 291c321..9d35dd9 100644 --- a/scout-boot-platform/.classpath +++ b/scout-boot-platform/.classpath @@ -1,36 +1,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scout-boot-platform/.settings/org.eclipse.core.resources.prefs b/scout-boot-platform/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/scout-boot-platform/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/scout-boot-ui-dev/.classpath b/scout-boot-ui-dev/.classpath index 291c321..3f925e3 100644 --- a/scout-boot-ui-dev/.classpath +++ b/scout-boot-ui-dev/.classpath @@ -1,36 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scout-boot-ui-dev/.project b/scout-boot-ui-dev/.project index 4ef3944..8e9d6ce 100644 --- a/scout-boot-ui-dev/.project +++ b/scout-boot-ui-dev/.project @@ -3,6 +3,8 @@ scout-boot-ui-dev + scout-boot-ui + scout-boot-platform diff --git a/scout-boot-ui-dev/.settings/org.eclipse.core.resources.prefs b/scout-boot-ui-dev/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/scout-boot-ui-dev/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/scout-boot-ui-security/.classpath b/scout-boot-ui-security/.classpath index 291c321..cf7aede 100644 --- a/scout-boot-ui-security/.classpath +++ b/scout-boot-ui-security/.classpath @@ -1,36 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scout-boot-ui-security/.project b/scout-boot-ui-security/.project index 76cee89..0773f85 100644 --- a/scout-boot-ui-security/.project +++ b/scout-boot-ui-security/.project @@ -3,6 +3,8 @@ scout-boot-ui-security + scout-boot-ui + scout-boot-platform diff --git a/scout-boot-ui-security/.settings/org.eclipse.core.resources.prefs b/scout-boot-ui-security/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/scout-boot-ui-security/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/scout-boot-ui/.classpath b/scout-boot-ui/.classpath index 291c321..b504d68 100644 --- a/scout-boot-ui/.classpath +++ b/scout-boot-ui/.classpath @@ -1,36 +1,48 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scout-boot-ui/.project b/scout-boot-ui/.project index a93254c..c93c21e 100644 --- a/scout-boot-ui/.project +++ b/scout-boot-ui/.project @@ -3,6 +3,7 @@ scout-boot-ui + scout-boot-platform diff --git a/scout-boot-ui/.settings/org.eclipse.core.resources.prefs b/scout-boot-ui/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/scout-boot-ui/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8