diff --git a/.editorconfig.txt b/.editorconfig.txt new file mode 100644 index 000000000..d7638731d --- /dev/null +++ b/.editorconfig.txt @@ -0,0 +1,18 @@ +# http://editorconfig.org +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +max_line_length = 80 +trim_trailing_whitespace = true + +[*.md] +max_line_length = 0 +trim_trailing_whitespace = false + +[COMMIT_EDITMSG] +max_line_length = 0 diff --git a/.gitignore b/.gitignore index b33f7679f..0b3f32343 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -_site/ -.sass-cache/ +_site +.sass-cache .jekyll-metadata -_pdf -.idea/ -.DS_Store +*.gem +.bundle +vendor/bundle diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..cba33b170 --- /dev/null +++ b/Gemfile @@ -0,0 +1,17 @@ +source "https://rubygems.org" +ruby RUBY_VERSION + +gem "jekyll", "3.4.0" + +# to use GitHub Pages +# gem "github-pages", group: :jekyll_plugins + +# If you have any plugins, put them here! +group :jekyll_plugins do + gem "jekyll-feed" + gem "jekyll-sitemap" + gem "jekyll-redirect-from" +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..59b7b284e --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,60 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + colorator (1.1.0) + ffi (1.9.17) + forwardable-extended (2.6.0) + jekyll (3.4.0) + addressable (~> 2.4) + colorator (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (~> 1.7) + safe_yaml (~> 1.0) + jekyll-feed (0.8.0) + jekyll (~> 3.3) + jekyll-redirect-from (0.12.1) + jekyll (~> 3.3) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-sitemap (1.0.0) + jekyll (~> 3.3) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + kramdown (1.13.2) + liquid (3.0.6) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) + pathutil (0.14.0) + forwardable-extended (~> 2.6) + public_suffix (2.0.5) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + rouge (1.11.1) + safe_yaml (1.0.4) + sass (3.4.23) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll (= 3.4.0) + jekyll-feed + jekyll-redirect-from + jekyll-sitemap + tzinfo-data + +RUBY VERSION + ruby 2.3.1p112 + +BUNDLED WITH + 1.14.3 diff --git a/README.md b/README.md new file mode 100644 index 000000000..1841ba549 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# LinkSmart Documentation & Website + +Add Markdown files to `docs` & `posts` and [Jekyll](http://jekyllrb.com/) will generate the static website. diff --git a/_config.yml b/_config.yml index ddad8a427..16fca2cb6 100644 --- a/_config.yml +++ b/_config.yml @@ -1,23 +1,29 @@ # Site settings title: LinkSmart email: your-email@domain.com -description: > # this means to ignore newlines until "baseurl:" - Write an awesome description for your new site here. You can edit this - line in _config.yml. It will appear in your document head meta (for - Google search results) and in your feed.xml site description. +description: > # Lorem ipsum dolor sit amet, consectetur adipiscing elit, + sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut + enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi + ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit + in voluptate velit esse cillum dolore eu fugiat nulla pariatur. baseurl: "" # the subpath of your site, e.g. /blog/ -url: "http://yourdomain.com" # the base hostname & protocol for your site -twitter_username: jekyllrb -github_username: jekyll +url: "linksmart-eu.github.io" # the base hostname & protocol for your site +github_address: https://github.com/linksmart-eu/linksmart-eu.github.io # Build settings -markdown: redcarpet -highlighter: pygments - +markdown: kramdown +highlighter: rouge +gems: + - jekyll-feed + - jekyll-sitemap + - jekyll-redirect-from exclude: + - Gemfile + - Gemfile.lock - .idea/ - .gitignore - + - README.md +timezone: Europe/Berlin defaults: - scope: path: '' diff --git a/_data/docs.yml b/_data/docs.yml new file mode 100644 index 000000000..bb9d3b14c --- /dev/null +++ b/_data/docs.yml @@ -0,0 +1,52 @@ +- title: Getting Started + docs: + - home + - quickstart + - installation + - usage + - structure + - configuration + +- title: Your Content + docs: + - frontmatter + - posts + - drafts + - pages + - static-files + - variables + - collections + - datafiles + - assets + - migrations + +- title: Customization + docs: + - templates + - includes + - permalinks + - pagination + - plugins + - themes + - extras + +- title: Deployment + docs: + - github-pages + - deployment-methods + - continuous-integration + +- title: Miscellaneous + docs: + - troubleshooting + - sites + - resources + - upgrading/0-to-2 + - upgrading/2-to-3 + +- title: Meta + docs: + - contributing + - maintaining + - conduct + - history diff --git a/_data/homepage.yml b/_data/homepage.yml deleted file mode 100644 index 8d1c8b69c..000000000 --- a/_data/homepage.yml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/_includes/footer.html b/_includes/footer.html index fe2ee55dc..806c3fb46 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,17 +1,15 @@ - - - + diff --git a/_includes/head.html b/_includes/head.html index 7c2750edd..52125b6da 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,22 +1,23 @@ - - - + + + - {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} + + + - - - + + + - + - - - + + diff --git a/_includes/topnav.html b/_includes/topnav.html index 7802e13fe..3265d7d5f 100644 --- a/_includes/topnav.html +++ b/_includes/topnav.html @@ -1,24 +1,22 @@ diff --git a/_layouts/default.html b/_layouts/default.html index c2a971041..2dee3381b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,20 +1,20 @@ - {% include head.html %} +{% include head.html %} - + {% include topnav.html %}
-
- {{ content }} -
+
+ {{ content }} +
{% include footer.html %} - + diff --git a/_layouts/docs.html b/_layouts/docs.html index 618e6db58..58ae6d357 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -5,25 +5,21 @@

-
-
-
-

DOCS

- -
-
+
+
-
-

{{ page.title }}

-
{{ content }}
-
+
+
+ +
+
+
+
+

{{ page.title }}

+
{{ content }}
+
-
+ +
diff --git a/_layouts/page.html b/_layouts/page.html index 74c1a1184..c577f598d 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,14 +1,15 @@ --- layout: default --- +
-
-

{{ page.title }}

-
+
+

{{ page.title }}

+
-
- {{ content }} -
+
+ {{ content }} +
diff --git a/_layouts/post.html b/_layouts/post.html index a2b4e52fe..cac2b3533 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,15 +1,45 @@ --- layout: default --- -
-
-

{{ page.title }}

-

{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}

-
+
+
+
+
-
- {{ content }} -
+
+
+

RECENT POSTS

+ +
+
+
+

{{ page.title }}

+

{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}

+
{{ content }}
+
+ +
+ +
diff --git a/_posts/2014-03-20-v2-1.md b/_posts/2014-03-20-v2-1.md new file mode 100644 index 000000000..29198fd18 --- /dev/null +++ b/_posts/2014-03-20-v2-1.md @@ -0,0 +1,23 @@ +--- +title: "LinkSmart 2.1 released!" +author: Jonathan Simon +--- + +The LinkSmart development team is pleased to announce the release of the enhanced and more robust **LinkSmart 2.1**, now [available for download](/redmine/projects/linksmart-opensource/files). +Our vision is to build an interoperability platform that facilitates the creation of cost-effective, high-performance cyber-physical systems and Internet of Things applications. LinkSmart constitutes an OSGi-based middleware for the networking of heterogeneous systems through loosely coupled web services. + +The new LinkSmart 2.1 supports a **broader range of configurations** in terms of functionality, resource constraints and communication infrastructure, thanks to the improved modularity introduced in the previous version. LinkSmart includes now a GrandMessageHandler component to provide support for **unconstrained message sizes**, and a **new tunnel service** offers querying for services through parameterized URLs, paving the way for innovative SOAP-less applications. + +In detail, LinkSmart 2.1 incorporates the following improvements: + +* [New tunnel service](/redmine/projects/linksmart-opensource/wiki/Tunneling_URL) +* [New backbones for binary messages and for local OSGi services](/redmine/projects/linksmart-opensource/wiki/Data-based_communication_with_LinkSmart) +* New component for handling large messages * New handshake protocol between NetworkManagers +* Improved test coverage * Internal handling of message encoding improved +* Many, many bug fixes + +The LinkSmart development team is working on more exciting changes to be featured in upcoming releases, such as: + + * Resource-oriented, RESTful APIs, + * Support for structured networks, and + * Switching to a Maven-based build chain. diff --git a/_posts/2014-12-05-v0-2-2.md b/_posts/2014-12-05-v0-2-2.md new file mode 100644 index 000000000..093b96ae6 --- /dev/null +++ b/_posts/2014-12-05-v0-2-2.md @@ -0,0 +1,17 @@ +--- +title: "LinkSmart 2.2 released!" +author: Aleaxndr Kryolsvkiy +--- + +The LinkSmart development team is pleased to announce the release of LinkSmart 2.2, now [available for download](https://linksmart.eu/repo/content/sites/doc/download.html). + +With 2.2 release, we have switched to a new build toolchain (maven) and the deployment model (apache karaf), which significantly simplifies the deployment and enables easy integration with IDEs and CI tools. + +For more information on how to get started, please refer to the updated [wiki](https://linksmart.eu/redmine/projects/linksmart-opensource/wiki). + +Changelog summary: + +* New scm (git) and build toolchain (maven/karaf) +* REST API for Network Manager +* MQTT-based Pub/Sub Eventing API +* Authorization/Policy Framework diff --git a/_posts/2015-07-07-v0-1.md b/_posts/2015-07-07-v0-1.md new file mode 100644 index 000000000..b7b6a9829 --- /dev/null +++ b/_posts/2015-07-07-v0-1.md @@ -0,0 +1,13 @@ +--- +title: "LinkSmart LocalConnect and GlobalConnect 0.1.0" +author: Aleaxndr Kryolsvkiy +--- + +The LinkSmart team is pleased to announce the release of LocalConnect and GlobalConnect 0.1.0. Changelog summary: + +* LocalConnect + * minor bug fixes + * integration with GlobalConnect (automatic publishing of LC Service Catalog services in GlobalConnect) +* GlobalConnect + * first release (**should be still considered alpha!**) + * integration with LocalConnect (automatic publishing of Services in Service Catalog) diff --git a/_posts/2016-01-22-v0-2.md b/_posts/2016-01-22-v0-2.md new file mode 100644 index 000000000..632bf86e4 --- /dev/null +++ b/_posts/2016-01-22-v0-2.md @@ -0,0 +1,18 @@ +--- +title: "LinkSmart LocalConnect and GlobalConnect 0.2.0" +author: Aleaxndr Kryolsvkiy +--- + +The LinkSmart team is pleased to announce the release of LocalConnect and GlobalConnect 0.2.0. Changelog summary: + +- LocalConnect + - Migration from godeps to gb vendor + - Authentication and authorization support for HTTP APIs (Optional) + - Persistent storage backend for service/resource catalogs (LevelDB) + - Device Gateway: + Configurable MQTT topic via 'pub_topc' in the device protocol + MQTT SUB: allow changing resource state via MQTT (similar to HTTP PUT) + - For other changes and bug fixes see [Changelog](https://linksmart.eu/redmine/projects/linksmart-local-connect/repository/lslc-core/revisions/master/entry/CHANGELOG.md) +- GlobalConnect: + - MQTT Backbone-Protocol first implementation: Now MQTT tunnelling is available + - Karaf is now configured to use system repository as default + - Updating configuration files at runtime is now possible + - For other changes and bug fixes see [Changelog](https://linksmart.eu/redmine/projects/linksmart-globalconnect/repository/revisions/master/entry/changelog.md) diff --git a/_posts/2017-02-01-welcome-to-jekyll.markdown b/_posts/2017-02-01-welcome-to-jekyll.markdown index 75abfb029..f2a1f90a6 100644 --- a/_posts/2017-02-01-welcome-to-jekyll.markdown +++ b/_posts/2017-02-01-welcome-to-jekyll.markdown @@ -2,7 +2,7 @@ layout: post title: "Welcome to Jekyll!" date: 2017-02-01 09:41:09 -categories: jekyll update +author: Jekyll --- You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. diff --git a/_sass/_site.scss b/_sass/_site.scss deleted file mode 100644 index e97c713f7..000000000 --- a/_sass/_site.scss +++ /dev/null @@ -1,24 +0,0 @@ -html { - position: relative; - min-height: 100%; -} -body { - padding-top: 50px; - margin-bottom: 46px; -} -.header-container { - background: url('../img/bg.jpg') no-repeat 50% 0; - background-size: cover; - background-position: center 35%; -} -.navbar-container { - font-size: 16px; -} -.footer { - position: absolute; - bottom: 0; - width: 100%; - height: 46px; - padding-top: 10px; - background-color: #f5f5f5; -} diff --git a/allposts.html b/allposts.html new file mode 100644 index 000000000..adfc30a6f --- /dev/null +++ b/allposts.html @@ -0,0 +1,18 @@ +--- +title: Blog +layout: default +sectionid: blog +--- + +
+
+
+
+

All Posts

{% for page in site.posts %} +

+ {{ page.title }} + on {{ page.date | date: "%B %e, %Y" }} {% if page.author %} by {{ page.author }}{% endif %} +

+ {% endfor %} +
+
diff --git a/blog/all.html b/blog/all.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/blog/index.html b/blog/index.html deleted file mode 100644 index 6c4eeab7f..000000000 --- a/blog/index.html +++ /dev/null @@ -1,40 +0,0 @@ ---- -title: Blog -layout: default -sectionid: blog ---- - -

-
-
- -
-
-

RECENT POSTS

- -
-
- -
-

Blog Post Title

-

November 16, 2016 by Dan Abramov

-
- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero, obcaecati, aut, error quam sapiente nemo saepe quibusdam sit excepturi nam quia corporis eligendi eos magni recusandae laborum minus inventore?

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eos, doloribus, dolorem iusto blanditiis unde eius illum consequuntur neque dicta incidunt ullam ea hic porro optio ratione repellat perspiciatis. Enim, iure!

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Error, nostrum, aliquid, animi, ut quas placeat totam sunt tempora commodi nihil ullam alias modi dicta saepe minima ab quo voluptatem obcaecati?

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Harum, dolor quis. Sunt, ut, explicabo, aliquam tenetur ratione tempore quidem voluptates cupiditate voluptas illo saepe quaerat numquam recusandae? Qui, necessitatibus, est!

- -
- -
- - -
-
diff --git a/css/main.scss b/css/main.scss index ecd11eb8a..309b3e35d 100755 --- a/css/main.scss +++ b/css/main.scss @@ -8,11 +8,9 @@ "variables", "bootstrap", "bootswatch", - "syntax-highlighting", - "site" + "syntax-highlighting" ; - html { position: relative; min-height: 100%; @@ -37,3 +35,8 @@ body { padding-top: 10px; background-color: #f5f5f5; } +.post-list-container { + li a.active { + font-weight: bold; + } +} diff --git a/docs/index.md b/docs/index.md index a73618da7..787b96338 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,5 +1,7 @@ --- -title: Docs +title: Welcome +permalink: /docs/home/ +redirect_from: /docs/index.html --- hello docs diff --git a/docs/introduction.md b/docs/introduction.md deleted file mode 100644 index 52e0554f4..000000000 --- a/docs/introduction.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -id: introduction -title: Introduction ---- - -hello docsss diff --git a/feed.xml b/feed.xml deleted file mode 100644 index a6628bd84..000000000 --- a/feed.xml +++ /dev/null @@ -1,30 +0,0 @@ ---- -layout: null ---- - - - - {{ site.title | xml_escape }} - {{ site.description | xml_escape }} - {{ site.url }}{{ site.baseurl }}/ - - {{ site.time | date_to_rfc822 }} - {{ site.time | date_to_rfc822 }} - Jekyll v{{ jekyll.version }} - {% for post in site.posts limit:10 %} - - {{ post.title | xml_escape }} - {{ post.content | xml_escape }} - {{ post.date | date_to_rfc822 }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {% for tag in post.tags %} - {{ tag | xml_escape }} - {% endfor %} - {% for cat in post.categories %} - {{ cat | xml_escape }} - {% endfor %} - - {% endfor %} - - diff --git a/index.html b/index.html index 98f0dbb1d..4a2ce06f4 100644 --- a/index.html +++ b/index.html @@ -3,46 +3,49 @@ ---
-
-

Open Source Middleware Platform

-

For Networked Embedded Systems, allowing developers to incorporate heterogeneous physical devices into their applications through easy-to-use web services for controlling any device.

-

Learn more

-
+
+

Open Source Middleware Platform

+

For Networked Embedded Systems, allowing developers to incorporate heterogeneous physical devices into their applications through easy-to-use web services for controlling any device.

+

Learn more

+
-
-
-

What is LinkSmart?

-

LinkSmart is a middleware for heterogeneous physical devices in a distributed architecture. It is a middleware which is 'inclusive' which means that it makes it possible to enable any device to be detectable and usable from a LinkSmart application. This overcomes the common problem of incompatibility between proprietary protocols and devices. It delivers development tools for application developer of ambient intelligent applications using such devices and also tools for device producers to enable their devices to be part of an ambient intelligence environment.

-
-
- +
+
+

What is LinkSmart?

+

LinkSmart is a middleware for heterogeneous physical devices in a distributed architecture. It is a middleware which is 'inclusive' which means that it makes it possible to enable any device to be detectable and usable from a LinkSmart application. + This overcomes the common problem of incompatibility between proprietary protocols and devices. It delivers development tools for application developer of ambient intelligent applications using such devices and also tools for device producers + to enable their devices to be part of an ambient intelligence environment.

+
+
+ +
-
- -
-
-
-

-

LinkSmart® LocalConnect

-

LinkSmart® LocalConnect provides a set of components allowing to set up local smart environments consisting of a number of devices, applications and services, which can be discovered and communicated with using the publish/subscribe or request/response - messaging.

-
-
-

-

LinkSmart® GlobalConnect

-

LinkSmart® GlobalConnect focuses on connecting remote LinkSmart® LocalConnect environments over the Internet enabling transparent communication of applications and services beyond the boundaries of a private network.

-
-
-

-

LinkSmart® Services

-

LinkSmart® Services is an umbrella project for Middleware services providing extended functionality for implementation of IoT applications and platforms.

+
+ +
+
+

+

LinkSmart® LocalConnect

+

LinkSmart® LocalConnect provides a set of components allowing to set up local smart environments consisting of a number of devices, applications and services, which can be discovered and communicated with using the publish/subscribe or request/response + messaging. +

+
+
+

+

LinkSmart® GlobalConnect

+

LinkSmart® GlobalConnect focuses on connecting remote LinkSmart® LocalConnect environments over the Internet enabling transparent communication of applications and services beyond the boundaries of a private network.

+
+
+

+

LinkSmart® Services

+

LinkSmart® Services is an umbrella project for Middleware services providing extended functionality for implementation of IoT applications and platforms.

+
-