svn commit: r1764658 - in /sling/trunk/contrib/extensions/contextaware-config/impl/src: main/java/org/apache/sling/contextaware/config/impl/ main/java/org/apache/sling/contextaware/config/impl/metadata/ test/java/org/apache/sling/contextaware/config/im...

[sseifert]

Author: sseifert
Date: Thu Oct 13 12:04:06 2016
New Revision: 1764658

URL: http://svn.apache.org/viewvc?rev=1764658&view=rev
Log:
move CONFIGURATION_CLASSES_HEADER constant to ConfigurationNameConstants

Modified:
    
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
    
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/metadata/ConfigClassBundleTackerCustomizer.java
    
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/metadata/BundleEventUtil.java

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java?rev=1764658&r1=1764657&r2=1764658&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
 Thu Oct 13 12:04:06 2016
@@ -29,4 +29,9 @@ public final class ConfigurationNameCons
      */
     public static final String CONFIGS_PARENT_NAME = "sling:configs";
 
+    /**
+     * Bundle header defining list of class names with all configuration 
annotation classes in this bundle.
+     */
+    public static final String CONFIGURATION_CLASSES_HEADER = 
"Sling-ContextAware-Configuration-Classes";
+    
 }

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/metadata/ConfigClassBundleTackerCustomizer.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/metadata/ConfigClassBundleTackerCustomizer.java?rev=1764658&r1=1764657&r2=1764658&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/metadata/ConfigClassBundleTackerCustomizer.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/metadata/ConfigClassBundleTackerCustomizer.java
 Thu Oct 13 12:04:06 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.contextaware.config.impl.metadata;
 
+import static 
org.apache.sling.contextaware.config.impl.ConfigurationNameConstants.CONFIGURATION_CLASSES_HEADER;
+
 import java.util.Dictionary;
 
 import org.osgi.framework.Bundle;
@@ -29,8 +31,6 @@ import org.osgi.util.tracker.BundleTrack
  */
 class ConfigClassBundleTackerCustomizer implements 
BundleTrackerCustomizer<BundleConfigurationMapping> {
 
-    static final String CONFIGURATION_CLASSES_HEADER = 
"Sling-ContextAware-Configuration-Classes";
-    
     private final AnnotationClassConfigurationMetadataProvider 
metadataProvider;
     
     public 
ConfigClassBundleTackerCustomizer(AnnotationClassConfigurationMetadataProvider 
metadataProvider) {

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/metadata/BundleEventUtil.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/metadata/BundleEventUtil.java?rev=1764658&r1=1764657&r2=1764658&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/metadata/BundleEventUtil.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/metadata/BundleEventUtil.java
 Thu Oct 13 12:04:06 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.contextaware.config.impl.metadata;
 
+import static 
org.apache.sling.contextaware.config.impl.ConfigurationNameConstants.CONFIGURATION_CLASSES_HEADER;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -103,7 +105,7 @@ final class BundleEventUtil {
         @Override
         public Dictionary<String,String> getHeaders() {
             Dictionary<String,String> headers = new Hashtable<>();
-            
headers.put(ConfigClassBundleTackerCustomizer.CONFIGURATION_CLASSES_HEADER, 
classNames);
+            headers.put(CONFIGURATION_CLASSES_HEADER, classNames);
             return headers;
         }