svn commit: r1800995 - in /sling/whiteboard/cziegeler/feature: readme.md src/main/java/org/apache/sling/feature/Extension.java

[cziegeler]

Author: cziegeler
Date: Thu Jul  6 08:57:20 2017
New Revision: 1800995

URL: http://svn.apache.org/viewvc?rev=1800995&view=rev
Log:
Change the way the framework is defined

Modified:
    sling/whiteboard/cziegeler/feature/readme.md
    
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extension.java

Modified: sling/whiteboard/cziegeler/feature/readme.md
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/readme.md?rev=1800995&r1=1800994&r2=1800995&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature/readme.md (original)
+++ sling/whiteboard/cziegeler/feature/readme.md Thu Jul  6 08:57:20 2017
@@ -209,19 +209,22 @@ An application jar can contain a set of
 An optional application configuration further defines the possibilites:
 
     {
-         features : [
+         "features" : [
              "org.apache.sling/org.apache.sling.launchpad/10"
          ],
-         options : [
+         "options" : [
              "org.apache.sling/org.apache.sling.scripting.jsp/1.0.0",
              {
                  "id" : 
"org.apache.sling/org.apache.sling.scripting.htl/1.0.0",
                  "tag": "htl"
              }
          ],
-         defaults : {
-             auto-add-options: true,
-             tags : ["htl"]
+         "defaults" : {
+             "auto-add-options": true,
+             "tags" : ["htl"]
+         },
+         "framework" : {
+             "id" : "org.apache.felix/org.apache.felix.framework/5.6.4"
          }
     }
 

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extension.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extension.java?rev=1800995&r1=1800994&r2=1800995&view=diff
==============================================================================
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extension.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extension.java
 Thu Jul  6 08:57:20 2017
@@ -31,9 +31,6 @@ import java.util.List;
  */
 public class Extension {
 
-    /** Common extension name to specify the framework. */
-    public static final String NAME_FRAMEWORK = "framework";
-
     /** Common extension name to specify the repoinit part for Apache Sling. */
     public static final String NAME_REPOINIT = "repoinit";