diff --git a/.gitignore b/.gitignore index 201c2719d..f01322ad9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ _site .DS_Store _eh3 documentation/3.0 +.idea diff --git a/404.html b/404.html index f722a420b..3a40cecf8 100644 --- a/404.html +++ b/404.html @@ -13,6 +13,8 @@

Sorry!
  • Downloads
  • Documentation
    • +
  • Resources
    • +
  • Ehcache Blog
  • About
  • News and Events
    • diff --git a/README.md b/README.md index bd96e1842..15d7d4d1b 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ This is the source code/files for the ehcache.org website. The files in this re * nokogiri : "gem install nokogiri" * asciidoctor: " gem install jasciidoctor" * jekyll-asciidoc: " gem install jekyll-asciidoc" + * jekyll-sitemap: " gem install jekyll-sitemap" * Clone this repository to your local system (if you're going to contribute content, fork it first, and clone that) * cd into the "ehcache.github.io" directory @@ -62,3 +63,37 @@ ehcache.org is served/hosted by github. The webserver does NOT serve the conte * Commit your changes and make a pull request to get the content of that branch into the master branch of the ehcache.github.io repository (which will then make it "live"). +### Contributing a blog post + +1. Ensure you first edit `_data/authors.yml` to add you information + +2. Create a new ASCII Doc file under `_posts/blog`. The file should be named with the following format: `yyyy-MM-DD-title-in-lowercase.adoc` + +3. Add a header in your file. Modify the fields according to your post, especially for the title, headline, tags, authors and date + +``` +layout: post +title: "Your blog post title" +headline: "Your blo post headline" +categories: blog +hidden: false +author: your_author_key +tags: [ehcache, website] +date: 2016-05-04T18:00:00-05:00 +modified: +``` + +4. Send your pull request :+1: + +### Contributing an external resource + +Same rules apply as above, except that you have to put your file into `_posts/resources` and add a header like this one: + +``` +title: "Ehcache 3: JSR-107 on steroids" +headline: "Ehcache 3: JSR-107 on steroids at Devoxx Morocco by Louis Jacomet" +categories: resources +date: 2015-11-18T00:00:00-00:00 +`` + +__IMPORTANT:__ Yout content MUST be short! Links, headline, title, that's all. diff --git a/_config.yml b/_config.yml index 6a37ea1d8..1bb877f9e 100644 --- a/_config.yml +++ b/_config.yml @@ -8,6 +8,7 @@ twitter_username: ehcache github_username: ehcache linkedin_username: terracotta facebook_username: Terracotta +disqus_shortname: ehcache eh3_source_dir: /_eh3 @@ -17,8 +18,7 @@ markdown: kramdown gems: - jekyll-asciidoc - - + - jekyll-sitemap asciidoctor: diff --git a/_data/authors.yml b/_data/authors.yml new file mode 100755 index 000000000..1d7508460 --- /dev/null +++ b/_data/authors.yml @@ -0,0 +1,8 @@ +# Authors + +mathieu_carbou: + name: Mathieu Carbou + web: https://www.linkedin.com/in/mathieucarbou + avatar: https://www.gravatar.com/avatar/9db6fc82f800e193111dd725dd3a7b52 + twitter: mathieucarbou + position: Software Engineer at Terracotta diff --git a/_includes/banner.html b/_includes/banner.html index 8d3aa989d..d3eb9278e 100644 --- a/_includes/banner.html +++ b/_includes/banner.html @@ -10,6 +10,10 @@

    JAVA’S MOST WIDELY-USED CACHE

          + +    + +    diff --git a/_includes/disqus_comments.html b/_includes/disqus_comments.html new file mode 100644 index 000000000..37ebe8ce0 --- /dev/null +++ b/_includes/disqus_comments.html @@ -0,0 +1,22 @@ +{% if site.disqus_shortname %} + + +{% endif %} \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index 8b9735287..1f8ff20e8 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -50,6 +50,12 @@ {% endif %} + +
  • + + Atom/RSS Feed + +
    • @@ -58,6 +64,10 @@
    Documentation
    + Resources +
    + Ehcache Blog +
    Join the Community diff --git a/_includes/head.html b/_includes/head.html index bb23482fc..486b3f27c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -9,11 +9,10 @@ {% if page.title %}{{ page.title | replace: '!DOC_VERSION!', page.ehc_version }}{% else %}{{ site.title }}{% endif %} - + - - + diff --git a/_includes/header.html b/_includes/header.html index 7e8f34299..36484fc26 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -21,25 +21,27 @@ diff --git a/_includes/social-share.html b/_includes/social-share.html new file mode 100644 index 000000000..f4b67553a --- /dev/null +++ b/_includes/social-share.html @@ -0,0 +1,9 @@ +
    + Tweet +
    +
    + Like +
    +
    + +1 +
    diff --git a/_layouts/post.html b/_layouts/post.html index a2b4e52fe..98119081a 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,15 +1,80 @@ --- layout: default --- -
    -
    -

    {{ page.title }}

    -

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

    -
    +
    -
    - {{ content }} -
    +{% if page.author %} + {% assign author = site.data.authors[page.author] %} +{% endif %} + +
    + +
    + + + + + +
    + +
    +

    {{ page.title }}

    +
    + +
    + +
    +
    +

    {% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}{% endif %}

    +
    + +
    + {{ content }} + + {% if site.disqus_shortname %} +
    + {% endif %} +
    +
    + +
    + +
    + +
    + +{% include disqus_comments.html %} diff --git a/_posts/2015-08-20-welcome-to-jekyll.markdown b/_posts/2015-08-20-welcome-to-jekyll.markdown deleted file mode 100644 index e4a20e747..000000000 --- a/_posts/2015-08-20-welcome-to-jekyll.markdown +++ /dev/null @@ -1,26 +0,0 @@ ---- -layout: post -title: "Welcome to Jekyll!" -date: 2015-08-20 14:36:42 -categories: jekyll update ---- -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. - -To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. - -Jekyll also offers powerful support for code snippets: - - -{% highlight ruby %} -def print_hi(name) - puts "Hi, #{name}" -end -print_hi('Tom') -#=> prints 'Hi, Tom' to STDOUT. -{% endhighlight %} - -Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll’s dedicated Help repository][jekyll-help]. - -[jekyll]: http://jekyllrb.com -[jekyll-gh]: https://github.com/jekyll/jekyll -[jekyll-help]: https://github.com/jekyll/jekyll-help diff --git a/_posts/blog/2016-05-04-new-website.adoc b/_posts/blog/2016-05-04-new-website.adoc new file mode 100755 index 000000000..001e9185d --- /dev/null +++ b/_posts/blog/2016-05-04-new-website.adoc @@ -0,0 +1,22 @@ +--- +layout: post +title: "New Website" +headline: "The new Ehcache website is LIVE! Checkout its first post..." +categories: blog +hidden: true +author: mathieu_carbou +tags: [ehcache, website] +comments: true +date: 2016-05-04T18:00:00-05:00 +modified: 2016-05-05T18:00:00-05:00 +--- + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent et purus at quam ullamcorper volutpat. Nullam ut nunc at sem tincidunt elementum vel et sem. Nam a nisl nec nisi tincidunt interdum in vel nulla. Maecenas ac elit vel felis pellentesque feugiat ut in quam. Quisque in dapibus enim, dapibus ultricies erat. Vivamus tristique varius magna at tincidunt. Ut venenatis dolor neque. Morbi pretium diam sed nulla consectetur maximus. Etiam sem turpis, ullamcorper sed arcu et, consectetur euismod est. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Mauris pharetra lorem ante, at suscipit urna bibendum ut. In a condimentum turpis. Pellentesque fermentum ex eget venenatis imperdiet. Donec vehicula vel purus et malesuada. Proin nunc quam, dictum ut elit ac, porttitor pretium elit. + +Donec sit amet ultricies risus, eget molestie enim. Sed sodales purus at enim imperdiet porta. Aliquam efficitur nunc ut elit auctor tincidunt in quis urna. Nullam pretium eget quam et mollis. Integer posuere est non nulla tempor, in tristique nisi tempus. Duis sagittis metus quis nibh posuere convallis. Nunc eu dolor quis tortor pulvinar volutpat ac in felis. Nulla interdum est dolor, et imperdiet massa viverra ac. Nam eu luctus augue. Proin facilisis ornare mi vitae pulvinar. Ut rhoncus vitae sapien sed consectetur. + +Curabitur eget purus molestie est fringilla imperdiet. Etiam id velit vel leo porttitor rhoncus. Nullam tempus placerat metus quis rutrum. Mauris efficitur nisi eleifend elit mollis tristique. Curabitur condimentum turpis id fermentum semper. Mauris vitae neque at erat dictum ultricies. Nam posuere ante sed nisi suscipit, vel euismod est dictum. Nullam ornare felis vitae arcu porta, ut egestas ipsum suscipit. Donec maximus urna auctor, vehicula lacus id, faucibus neque. Proin rhoncus vel mauris eget commodo. Mauris suscipit, magna at porttitor efficitur, leo justo porttitor neque, sed venenatis lacus urna sed felis. + +Cras feugiat odio elit, et mollis lorem dignissim at. Nulla pretium sollicitudin blandit. Nullam ut dolor id tellus aliquet tincidunt a ac ante. Praesent ornare consectetur ipsum, quis imperdiet nisl fringilla facilisis. Nullam vel laoreet urna. Maecenas laoreet interdum leo, sed placerat nisl ornare id. Morbi pharetra urna pretium, dapibus metus at, auctor felis. Phasellus quis lacinia tortor. + +Cras feugiat magna urna, nec tempor magna luctus vel. Suspendisse quis rutrum diam. Phasellus lacinia quam ut gravida volutpat. Aliquam erat volutpat. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nullam id sem ac metus sagittis vulputate non at quam. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut lobortis nibh vel eros bibendum tristique interdum nec nulla. diff --git a/_posts/blog/2016-05-05-second-post.adoc b/_posts/blog/2016-05-05-second-post.adoc new file mode 100755 index 000000000..31255813c --- /dev/null +++ b/_posts/blog/2016-05-05-second-post.adoc @@ -0,0 +1,20 @@ +--- +layout: post +title: "Second blog post" +headline: "Checkout this super blog post also..." +categories: blog +hidden: true +author: mathieu_carbou +tags: [ehcache, website] +comments: true +date: 2016-05-05T00:00:00-`05:00 +modified: +--- + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent et purus at quam ullamcorper volutpat. Nullam ut nunc at sem tincidunt elementum vel et sem. Nam a nisl nec nisi tincidunt interdum in vel nulla. Maecenas ac elit vel felis pellentesque feugiat ut in quam. Quisque in dapibus enim, dapibus ultricies erat. Vivamus tristique varius magna at tincidunt. Ut venenatis dolor neque. Morbi pretium diam sed nulla consectetur maximus. Etiam sem turpis, ullamcorper sed arcu et, consectetur euismod est. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Mauris pharetra lorem ante, at suscipit urna bibendum ut. In a condimentum turpis. Pellentesque fermentum ex eget venenatis imperdiet. Donec vehicula vel purus et malesuada. Proin nunc quam, dictum ut elit ac, porttitor pretium elit. + +Donec sit amet ultricies risus, eget molestie enim. Sed sodales purus at enim imperdiet porta. Aliquam efficitur nunc ut elit auctor tincidunt in quis urna. Nullam pretium eget quam et mollis. Integer posuere est non nulla tempor, in tristique nisi tempus. Duis sagittis metus quis nibh posuere convallis. Nunc eu dolor quis tortor pulvinar volutpat ac in felis. Nulla interdum est dolor, et imperdiet massa viverra ac. Nam eu luctus augue. Proin facilisis ornare mi vitae pulvinar. Ut rhoncus vitae sapien sed consectetur. + +Curabitur eget purus molestie est fringilla imperdiet. Etiam id velit vel leo porttitor rhoncus. Nullam tempus placerat metus quis rutrum. Mauris efficitur nisi eleifend elit mollis tristique. Curabitur condimentum turpis id fermentum semper. Mauris vitae neque at erat dictum ultricies. Nam posuere ante sed nisi suscipit, vel euismod est dictum. Nullam ornare felis vitae arcu porta, ut egestas ipsum suscipit. Donec maximus urna auctor, vehicula lacus id, faucibus neque. Proin rhoncus vel mauris eget commodo. Mauris suscipit, magna at porttitor efficitur, leo justo porttitor neque, sed venenatis lacus urna sed felis. + +Cras feugiat odio elit, et mollis lorem dignissim at. Nulla pretium sollicitudin blandit. Nullam ut dolor id tellus aliquet tincidunt a ac ante. Praesent ornare consectetur ipsum, quis imperdiet nisl fringilla facilisis. Nullam vel laoreet urna. Maecenas laoreet interdum leo, sed placerat nisl ornare id. Morbi pharetra urna pretium, dapibus metus at, auctor felis. Phasellus quis lacinia tortor. diff --git a/_posts/resources/2015-10-19-javax-cache-to-your-app.adoc b/_posts/resources/2015-10-19-javax-cache-to-your-app.adoc new file mode 100755 index 000000000..e9e81c909 --- /dev/null +++ b/_posts/resources/2015-10-19-javax-cache-to-your-app.adoc @@ -0,0 +1,9 @@ +--- +title: "Bringing javax.cache'ing to your application" +headline: "SpringOne2GX 2015 replay: Bringing javax.cache'ing to your application by Alex Snaps and Chris Dennis" +categories: resources +date: 2015-10-19T00:00:00-00:00 +--- + +* Video: https://spring.io/blog/2015/10/19/springone2gx-2015-replay-bringing-javax-cache-ing-to-your-application +* Slides: http://www.slideshare.net/SpringCentral/bringing-javaxcacheing-to-your-app diff --git a/_posts/resources/2015-11-13-terracotta-offHeap.adoc b/_posts/resources/2015-11-13-terracotta-offHeap.adoc new file mode 100755 index 000000000..bc66c2991 --- /dev/null +++ b/_posts/resources/2015-11-13-terracotta-offHeap.adoc @@ -0,0 +1,9 @@ +--- +title: "Terracotta’s OffHeap Explained" +headline: "Terracotta’s OffHeap Explained, by Chris Dennis" +categories: resources +date: 2015-11-13T00:00:00-00:00 +--- + +* Video: https://www.youtube.com/watch?v=xCojSZMp_Zw +* Slides: http://www.slideshare.net/ChrisDennis7/terracottas-offheap-explained-55214150 diff --git a/_posts/resources/2015-11-18-ehcache3-jsr107.adoc b/_posts/resources/2015-11-18-ehcache3-jsr107.adoc new file mode 100755 index 000000000..b4e41bf0c --- /dev/null +++ b/_posts/resources/2015-11-18-ehcache3-jsr107.adoc @@ -0,0 +1,8 @@ +--- +title: "Ehcache 3: JSR-107 on steroids" +headline: "Ehcache 3: JSR-107 on steroids at Devoxx Morocco by Louis Jacomet" +categories: resources +date: 2015-11-18T00:00:00-00:00 +--- + +* Slides: http://www.slideshare.net/LouisJacomet/ehcache-3-jsr107-on-steroids-at-devoxx-morocco diff --git a/_sass/_base.scss b/_sass/_base.scss index d7bf113ca..336348c71 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -593,4 +593,81 @@ pre { #content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400} #content h1>a.anchor:before,h2>a.anchor:before,h3>a.anchor:before,#toctitle>a.anchor:before,.sidebarblock>.content>.title>a.anchor:before,h4>a.anchor:before,h5>a.anchor:before,h6>a.anchor:before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em} #content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible} - + +#sidebar { + + .section { + margin-left: auto; + margin-right: auto; + text-align: center; + margin-top: 0px; + margin-bottom: 0px; + padding-top: 10px; + padding-bottom: 10px; + border-bottom: 1px solid rgba(247, 139, 14, 0.3); + width: 50%; + } + + .section:last-child { + border-bottom: none; + margin-bottom: 10px; + } + + .bio-photo { + display: block; + width: 150px; + height: 150px; + margin-bottom: 10px; + margin-left: auto; + margin-right: auto; + @include rounded(150px); + @include clearfix; + } + + .social-share { + display: inline-block; + margin-left: 5px; + margin-right: 5px; + } +} + +.entry-tags { + display: block; + margin-top: 2em; + text-transform: uppercase; + font-size: $base-font-size; + font-weight: 600; + a { + color: $text-color; + } +} + +.post-list { + + .bio-photo { + display: inline-block; + width: 80px; + height: 80px; + margin-right: 20px; + @include rounded(80px); + @include clearfix; + } + + .entry-date { + float: right; + } + + .entry { + clear: both; + margin-top: 0px; + margin-bottom: 0px; + padding-top: 10px; + padding-bottom: 10px; + border-bottom: 1px solid rgba(247, 139, 14, 0.3); + min-height: 100px; + } + + .entry:last-child { + border-bottom: none; + } +} \ No newline at end of file diff --git a/_sass/_mixins.scss b/_sass/_mixins.scss new file mode 100644 index 000000000..901574aec --- /dev/null +++ b/_sass/_mixins.scss @@ -0,0 +1,24 @@ +// @include rounded(VALUE); +@mixin rounded($radius:4px) { + border-radius : $radius; } + +@mixin clearfix { + &:after { + content:""; + display:table; + clear:both; + } +} + +// Using media queries with like this: +// @include media-query($on-palm) { +// .wrapper { +// padding-right: $spacing-unit / 2; +// padding-left: $spacing-unit / 2; +// } +// } +@mixin media-query($device) { + @media screen and (max-width: $device) { + @content; + } +} \ No newline at end of file diff --git a/blog/index.html b/blog/index.html new file mode 100755 index 000000000..3fb2a654b --- /dev/null +++ b/blog/index.html @@ -0,0 +1,52 @@ +--- +layout: default +title: Ehcache Blog +headline: Read all blog posts about Ehcache, the most widely used Java caching library +--- + +
    + +
    + +
    + + + + + +
    +
    +
    +
    +
      + {% for post in site.categories.blog %} + {% if post.hidden != true %} +
    • +
      +
      + {{ site.data.authors[post.author].name }} bio photo +
      +
      +
      + +
      + +
      +

      {{ post.headline }}

      +
      +
      +
      +
      • + {% endif %} + {% endfor %} +
    +
    +
    + +
    + +
    diff --git a/css/main.scss b/css/main.scss index 5185a3db7..6716d142c 100755 --- a/css/main.scss +++ b/css/main.scss @@ -27,25 +27,9 @@ $content-width: 800px; $on-palm: 600px; $on-laptop: 800px; - - -// Using media queries with like this: -// @include media-query($on-palm) { -// .wrapper { -// padding-right: $spacing-unit / 2; -// padding-left: $spacing-unit / 2; -// } -// } -@mixin media-query($device) { - @media screen and (max-width: $device) { - @content; - } -} - - - // Import partials from `sass_dir` (defaults to `_sass`) @import + "mixins", "base", "layout", "syntax-highlighting" diff --git a/feed.xml b/feed.xml new file mode 100755 index 000000000..02b7b43fc --- /dev/null +++ b/feed.xml @@ -0,0 +1,38 @@ +--- +layout: +sitemap: false +--- + + +{{ site.title }} +Jekyll + + +{{ site.time | date_to_xmlschema }} +{{ site.url }}/ + + {{ site.title }} + {{ site.url }}/ + {% if site.email %}{{ site.email }}{% endif %} + +{% for post in site.posts limit:20 %} + {% if post.hidden != true %} + {% assign author = site.data.authors[post.author] %} + + <![CDATA[{{ post.title | cdata_escape }}]]> + + {{ site.url }}{{ post.id }} + {% if post.modified %}{{ post.modified | to_xmlschema }}T00:00:00-00:00 + {{ post.date | date_to_xmlschema }} + {% else %}{{ post.date | date_to_xmlschema }} + {{ post.date | date_to_xmlschema }}{% endif %} + + {{ author.name }} + {{ site.url }} + + {{ post.content | xml_escape }} + <p><a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a> was originally published by {{ author.name }} at <a href="{{ site.url }}">{{ site.title }}</a> on {{ post.date | date: "%B %d, %Y" }}.</p> + + {% endif %} +{% endfor %} + \ No newline at end of file diff --git a/resources/index.html b/resources/index.html new file mode 100755 index 000000000..db54efceb --- /dev/null +++ b/resources/index.html @@ -0,0 +1,40 @@ +--- +layout: default +title: Ehcache Resources +headline: Links to all external resources talking about Ehcache, the most widely used Java caching library +--- + +
    + +
    + +
    + + + + + +
    +
    +
    +
    +
      + {% for post in site.categories.resources %} +
    • +
      + +

      {{ post.title }}

      +

      {{ post.headline }}

      +

      {{ post.content }}

      +
      +
      • + {% endfor %} +
    +
    +
    + +
    + +
    diff --git a/tags/index.md b/tags/index.md new file mode 100644 index 000000000..9f92fc7f0 --- /dev/null +++ b/tags/index.md @@ -0,0 +1,29 @@ +--- +layout: page +title: Tag Index +excerpt: "An archive of posts sorted by tag." +--- + +{% capture site_tags %}{% for tag in site.tags %}{{ tag | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %} +{% assign tags_list = site_tags | split:',' | sort %} + + + +{% for item in (0..site.tags.size) %}{% unless forloop.last %} + {% capture this_word %}{{ tags_list[item] | strip_newlines }}{% endcapture %} +

    {{ this_word }}

    + +{% endunless %}{% endfor %} \ No newline at end of file