You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2018/05/18 16:09:22 UTC
[sling-site] branch master updated (eaf6b64 -> 2cdf0b8)
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git.
from eaf6b64 Merge pull request #15 from NguyenPatrick/patch-2
new f09e2c2 Add Feature Model page
new 353a808 Add launchers tag
new 2cdf0b8 Merge branch 'master' of github.com:apache/sling-site
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../content/documentation/development/feature-model.md | 14 ++++++++++++++
.../jbake/content/documentation/development/slingstart.md | 6 ++++++
.../documentation/the-sling-engine/the-sling-launchpad.md | 2 +-
3 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 src/main/jbake/content/documentation/development/feature-model.md
--
To stop receiving notification emails like this one, please contact
bdelacretaz@apache.org.
[sling-site] 03/03: Merge branch 'master' of
github.com:apache/sling-site
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit 2cdf0b89070e775bb6be5156b6b11a771b5a31d3
Merge: 353a808 eaf6b64
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri May 18 18:07:16 2018 +0200
Merge branch 'master' of github.com:apache/sling-site
.../jbake/content/documentation/development/release-management.md | 7 ++++---
.../jbake/content/documentation/the-sling-engine/authentication.md | 2 +-
.../authentication/authentication-authenticationhandler.md | 2 +-
src/main/jbake/content/releases.md | 5 ++++-
src/main/jbake/templates/downloads.tpl | 6 +++---
5 files changed, 13 insertions(+), 9 deletions(-)
--
To stop receiving notification emails like this one, please contact
bdelacretaz@apache.org.
[sling-site] 01/03: Add Feature Model page
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit f09e2c26fba7454397ac881ef7c7c0d8d48e11c4
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed May 9 15:15:57 2018 +0200
Add Feature Model page
---
.../content/documentation/development/feature-model.md | 14 ++++++++++++++
.../jbake/content/documentation/development/slingstart.md | 6 ++++++
2 files changed, 20 insertions(+)
diff --git a/src/main/jbake/content/documentation/development/feature-model.md b/src/main/jbake/content/documentation/development/feature-model.md
new file mode 100644
index 0000000..6f99012
--- /dev/null
+++ b/src/main/jbake/content/documentation/development/feature-model.md
@@ -0,0 +1,14 @@
+title=The OSGi Feature Model
+type=page
+status=published
+tags=slingstart,maven,launchers,featuremodel
+~~~~~~
+
+The OSGi Feature Model, created in 2018, is meant to replace the Sling Provisioning Model as the primary way of defining and assembling Sling applications.
+
+Compared to the Provisioning Model, the Feature Model is richer and more general, and might evolve into an OSGi
+standard. It has been created in Sling as that's its primary audience for now, but might move elsewhere as it
+evolves.
+
+See [https://github.com/apache/sling-org-apache-sling-feature](https://github.com/apache/sling-org-apache-sling-feature) for more information
+about the Feature Model.
\ No newline at end of file
diff --git a/src/main/jbake/content/documentation/development/slingstart.md b/src/main/jbake/content/documentation/development/slingstart.md
index d80d28f..dca3858 100644
--- a/src/main/jbake/content/documentation/development/slingstart.md
+++ b/src/main/jbake/content/documentation/development/slingstart.md
@@ -6,6 +6,12 @@ tags=slingstart,maven,launchers
[TOC]
+<div class="note">
+ The <a href="/documentation/development/feature-model.html">OSGi Feature Model</a> is
+ meant to eventually replace the Sling Provisioning Model. If you are starting a new Sling project, please ask on
+ the Sling developers list about the status of the Feature Model to figure out which is best suited to your needs.
+</div>
+
The Apache Sling provisioning model is a model to describe OSGi based application. It can also be used to define a partial application aka feature (or subsystem in OSGi terms).
The model is describing an instance, it is not directly related to any particular tooling or packaging/provisioning vehicle.
--
To stop receiving notification emails like this one, please contact
bdelacretaz@apache.org.
[sling-site] 02/03: Add launchers tag
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit 353a80890fc4129e3d08167a7dad005aaed42c88
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed May 9 15:21:31 2018 +0200
Add launchers tag
---
.../jbake/content/documentation/the-sling-engine/the-sling-launchpad.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/jbake/content/documentation/the-sling-engine/the-sling-launchpad.md b/src/main/jbake/content/documentation/the-sling-engine/the-sling-launchpad.md
index ed83fb9..e5de2e3 100644
--- a/src/main/jbake/content/documentation/the-sling-engine/the-sling-launchpad.md
+++ b/src/main/jbake/content/documentation/the-sling-engine/the-sling-launchpad.md
@@ -1,7 +1,7 @@
title=The Sling Launchpad
type=page
status=published
-tags=launchpad
+tags=launchpad,launchers
~~~~~~
[TOC]
--
To stop receiving notification emails like this one, please contact
bdelacretaz@apache.org.