Author: sseifert
Date: Fri Oct 14 13:37:41 2016
New Revision: 1764893

URL: http://svn.apache.org/viewvc?rev=1764893&view=rev
Log:
SLING-6154 Context-Aware Config: Use camel case for property names

Modified:
    
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
    
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategy.java
    
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java
    
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java
    
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java
    
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java?rev=1764893&r1=1764892&r2=1764893&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
 Fri Oct 14 13:37:41 2016
@@ -28,18 +28,18 @@ public final class ConfigurationResource
      * Property that points to the configuration path to be used.
      * Additionally each resource having this property marks the beginning of 
a new context sub-tree.
      */
-    public static final String PROPERTY_CONFIG_REF = "sling:config-ref";
+    public static final String PROPERTY_CONFIG_REF = "sling:configRef";
    
     /**
      * Boolean property that controls whether config resource collections 
should be merged on inheritance or not.
      * Merging means merging the lists, not the list items (properties of the 
resources) itself.
      */
-    public static final String PROPERTY_CONFIG_COLLECTION_INHERIT = 
"sling:config-collection-inherit";
+    public static final String PROPERTY_CONFIG_COLLECTION_INHERIT = 
"sling:configCollectionInherit";
 
     /**
      * Boolean property that controls whether the properties (key/value pairs) 
of configuration resources
      * should be inherited from the configuration hierarchy and merged.
      */
-    public static final String PROPERTY_CONFIG_PROPERTY_INHERIT = 
"sling:config-property-inherit";
+    public static final String PROPERTY_CONFIG_PROPERTY_INHERIT = 
"sling:configPropertyInherit";
 
 }

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategy.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategy.java?rev=1764893&r1=1764892&r2=1764893&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategy.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategy.java
 Fri Oct 14 13:37:41 2016
@@ -49,7 +49,7 @@ public class DefaultContextPathStrategy
         boolean enabled() default true;
 
         @AttributeDefinition(name="Config ref. resource names",
-                description = "Names of resource to try to look up 
sling:config-ref property in. If list is empty only current resource is 
checked.")
+                description = "Names of resource to try to look up 
sling:configRef property in. If list is empty only current resource is 
checked.")
         String[] configRefResourceNames();
 
     }
@@ -105,7 +105,7 @@ public class DefaultContextPathStrategy
         /**
          * Find next configuration context root for given resource.
          * @param startResource Resource to start searching
-         * @return Next resource with sling:config-ref property or null if 
none found.
+         * @return Next resource with sling:configRef property or null if none 
found.
          */
         private ContextResource findNextContextResource(Resource 
startResource) {
             // start at resource, go up

Modified: 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java?rev=1764893&r1=1764892&r2=1764893&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java
 Fri Oct 14 13:37:41 2016
@@ -78,7 +78,7 @@ public class AdaptToConfigClassIT {
                 "stringParam", "value1",
                 "intParam", 123,
                 "boolParam", true)
-            .resource(PAGE_PATH, "sling:config-ref", CONFIG_PATH);
+            .resource(PAGE_PATH, "sling:configRef", CONFIG_PATH);
 
         Resource resourcePage1 = resourceResolver.getResource(PAGE_PATH);
         

Modified: 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java?rev=1764893&r1=1764892&r2=1764893&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java
 Fri Oct 14 13:37:41 2016
@@ -70,7 +70,7 @@ public class ConfigurationManagerIT {
         configManager = teleporter.getService(ConfigurationManager.class);
         configResolver = teleporter.getService(ConfigurationResolver.class);
         
-        resourcePage1 = resourceBuilder.resource(PAGE_PATH, 
"sling:config-ref", CONFIG_PATH).getCurrentParent();
+        resourcePage1 = resourceBuilder.resource(PAGE_PATH, "sling:configRef", 
CONFIG_PATH).getCurrentParent();
     }
     
     @After

Modified: 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java?rev=1764893&r1=1764892&r2=1764893&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java
 Fri Oct 14 13:37:41 2016
@@ -80,7 +80,7 @@ public class ConfigurationResolverConfig
                 "stringParam", "value1",
                 "intParam", 123,
                 "boolParam", true)
-            .resource(PAGE_PATH, "sling:config-ref", CONFIG_PATH);
+            .resource(PAGE_PATH, "sling:configRef", CONFIG_PATH);
         
         Resource resourcePage1 = resourceResolver.getResource(PAGE_PATH);
         

Modified: 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java?rev=1764893&r1=1764892&r2=1764893&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java
 Fri Oct 14 13:37:41 2016
@@ -79,7 +79,7 @@ public class ConfigurationResolverValueM
                 "stringParam", "value1",
                 "intParam", 123,
                 "boolParam", true)
-            .resource(PAGE_PATH, "sling:config-ref", CONFIG_PATH);
+            .resource(PAGE_PATH, "sling:configRef", CONFIG_PATH);
         
         Resource resourcePage1 = resourceResolver.getResource(PAGE_PATH);
         


Reply via email to