svn commit: r1802355 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java

[cziegeler]

Author: cziegeler
Date: Wed Jul 19 05:06:37 2017
New Revision: 1802355

URL: http://svn.apache.org/viewvc?rev=1802355&view=rev
Log:
Remove intermediate 'configurations' node

Modified:
    
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java

Modified: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java?rev=1802355&r1=1802354&r2=1802355&view=diff
==============================================================================
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java
 Wed Jul 19 05:06:37 2017
@@ -67,7 +67,7 @@ public class ConfigurationUtil {
         if ( additionalAttributes != null ) {
             for(final Map.Entry<String, String> entry : 
additionalAttributes.entrySet()) {
                 if ( Constants.REQUIRE_CAPABILITY.equals(entry.getKey())
-                    && 
!entry.getValue().contains("osgi.implementation=osgi.configurator")) {
+                    && 
!entry.getValue().contains("osgi.extender=osgi.configurator")) {
                     mf.getMainAttributes().putValue(entry.getKey(), 
entry.getValue() + "," + REQUIRE_CONFIGURATOR_CAPABILITY);
                 } else {
                     mf.getMainAttributes().putValue(entry.getKey(), 
entry.getValue());
@@ -80,10 +80,7 @@ public class ConfigurationUtil {
         final ZipEntry ze = new 
ZipEntry("OSGI-INF/configurator/configurations.json");
         jos.putNextEntry(ze);
         final Writer w = new OutputStreamWriter(jos, "UTF-8");
-        w.write("{\n");
-        w.write("\"configurations\" : ");
         ConfigurationJSONWriter.write(w, configurations);
-        w.write("\n}\n");
         w.flush();
         jos.closeEntry();