svn commit: r1800996 - in /sling/whiteboard/cziegeler: feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java

[cziegeler]

Author: cziegeler
Date: Thu Jul  6 09:01:24 2017
New Revision: 1800996

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

Modified:
    
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
    
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java

Modified: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1800996&r1=1800995&r2=1800996&view=diff
==============================================================================
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
 Thu Jul  6 09:01:24 2017
@@ -27,8 +27,6 @@ import java.util.List;
 
 import org.apache.sling.feature.Application;
 import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.Extension;
-import org.apache.sling.feature.ExtensionType;
 import org.apache.sling.feature.Feature;
 import org.apache.sling.feature.json.FeatureJSONReader;
 import org.apache.sling.feature.process.ApplicationBuilder;
@@ -249,18 +247,8 @@ public class FeatureUtil {
             }
         }, features.toArray(new Feature[features.size()]));
 
-        // search for framework extension
-        Extension fwk = 
app.getExtensions().getByName(Extension.NAME_FRAMEWORK);
-        if ( fwk != null ) {
-            if ( fwk.getType() != ExtensionType.ARTIFACTS ) {
-                throw new IOException("Extension " + Extension.NAME_FRAMEWORK 
+ " is of wrong type: " + fwk.getType());
-            }
-            if ( fwk.getArtifacts().size() != 1 ) {
-                throw new IOException("Extension " + Extension.NAME_FRAMEWORK 
+ " must have exactly one artifact: " + fwk.getArtifacts().size());
-            }
-            app.setFramework(fwk.getArtifacts().get(0).getId());
-            app.getExtensions().remove(fwk);
-        } else {
+        // check framework
+        if ( app.getFramework() == null ) {
             // use hard coded Apache Felix
             app.setFramework(getFelixFrameworkId(null));
         }

Modified: 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java?rev=1800996&r1=1800995&r2=1800996&view=diff
==============================================================================
--- 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
 (original)
+++ 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
 Thu Jul  6 09:01:24 2017
@@ -54,12 +54,10 @@ public abstract class ProjectHelper {
 
     private static void store(final MavenProject project, final String key, 
final Feature feature) {
         if ( feature != null ) {
-            try {
-                // we have to serialize as the dependency lifecycle 
participant uses a different class loader (!)
-                try ( final StringWriter w1 = new StringWriter() ) {
-                    FeatureJSONWriter.write(w1, feature);
-                    project.setContextValue(key, w1.toString());
-                }
+            // we have to serialize as the dependency lifecycle participant 
uses a different class loader (!)
+            try ( final StringWriter w1 = new StringWriter() ) {
+                FeatureJSONWriter.write(w1, feature);
+                project.setContextValue(key, w1.toString());
             } catch ( final IOException ioe) {
                 throw new RuntimeException(ioe.getMessage(), ioe);
             }