From 8282fc69dc152d4d61d21d186566c43748b1ba93 Mon Sep 17 00:00:00 2001 From: Thomas Dietrich Date: Fri, 2 Sep 2016 13:37:14 +0200 Subject: [PATCH 1/2] Add .gitignore and .gitattributes Signed-off-by: Thomas Dietrich --- .../src/main/resources/.gitattributes | 6 ++++++ .../openhab-demo-resources/src/main/resources/.gitignore | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 features/openhab-demo-resources/src/main/resources/.gitattributes create mode 100644 features/openhab-demo-resources/src/main/resources/.gitignore diff --git a/features/openhab-demo-resources/src/main/resources/.gitattributes b/features/openhab-demo-resources/src/main/resources/.gitattributes new file mode 100644 index 0000000000..755cda4e3c --- /dev/null +++ b/features/openhab-demo-resources/src/main/resources/.gitattributes @@ -0,0 +1,6 @@ +*.items linguist-language=Xtend +*.persist linguist-language=Xtend +*.sitemap linguist-language=Xtend +*.things linguist-language=Xtend +*.map linguist-language=Xtend +*.cfg linguist-language=INI diff --git a/features/openhab-demo-resources/src/main/resources/.gitignore b/features/openhab-demo-resources/src/main/resources/.gitignore new file mode 100644 index 0000000000..2e146a8d15 --- /dev/null +++ b/features/openhab-demo-resources/src/main/resources/.gitignore @@ -0,0 +1,6 @@ +# This file is only relevant, if you decide to track your configuration in a git repository. +# If you are going to upload your configuration to GitHub or another public place, be sure to +# hide your sensitive data, examples may be: + +#services/pushover.cfg # may contain your login credentials +#things/astro.things # may contain your physical location From ef57e3d255c32051c7b611f25665dd50cc4efaad Mon Sep 17 00:00:00 2001 From: Thomas Dietrich Date: Fri, 2 Sep 2016 13:37:55 +0200 Subject: [PATCH 2/2] Add vim modeline to demo files Signed-off-by: Thomas Dietrich --- .../src/main/resources/items/demo.items | 4 +++- .../resources/persistence/logging.persist | 4 +++- .../main/resources/persistence/rrd4j.persist | 2 ++ .../src/main/resources/rules/demo.rules | 24 ++++++++++--------- .../src/main/resources/scripts/demo.script | 2 ++ .../src/main/resources/sitemaps/demo.sitemap | 6 +++-- .../src/main/resources/things/demo.things | 2 ++ 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/features/openhab-demo-resources/src/main/resources/items/demo.items b/features/openhab-demo-resources/src/main/resources/items/demo.items index 2fa22280c8..afb064d113 100644 --- a/features/openhab-demo-resources/src/main/resources/items/demo.items +++ b/features/openhab-demo-resources/src/main/resources/items/demo.items @@ -4,7 +4,7 @@ Group gC "Cellar" Group Garden "Garden" Group Weather "Weather" -Group Status +Group Status Group Shutters Group GF_Living "Living Room"