Author: kwin
Date: Wed Feb 25 14:43:46 2015
New Revision: 1662230
URL: http://svn.apache.org/r1662230
Log:
SLING-4454 fix description and javadoc around service rankings of Use Providers
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java?rev=1662230&r1=1662229&r2=1662230&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
Wed Feb 25 14:43:46 2015
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
name = Constants.SERVICE_RANKING,
label = "Service Ranking",
description = "The Service Ranking value acts as the priority
with which this Use Provider is queried to return an " +
- "Use-object. A higher value represents a higher
priority.",
+ "Use-object. The lower the value, the earlier the Use
Provider is asked.",
intValue = 90,
propertyPrivate = false
)
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java?rev=1662230&r1=1662229&r2=1662230&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java
Wed Feb 25 14:43:46 2015
@@ -55,7 +55,7 @@ import org.osgi.framework.Constants;
name = Constants.SERVICE_RANKING,
label = "Service Ranking",
description = "The Service Ranking value acts as the priority
with which this Use Provider is queried to return an " +
- "Use-object. A higher value represents a higher
priority.",
+ "Use-object. The lower the value, the earlier the Use
Provider is asked.",
intValue = 100,
propertyPrivate = false
)
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java?rev=1662230&r1=1662229&r2=1662230&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java
Wed Feb 25 14:43:46 2015
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
name = Constants.SERVICE_RANKING,
label = "Service Ranking",
description = "The Service Ranking value acts as the priority
with which this Use Provider is queried to return an " +
- "Use-object. A higher value represents a higher
priority.",
+ "Use-object. The lower the value, the earlier the Use
Provider is asked.",
intValue = 0,
propertyPrivate = false
)
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java?rev=1662230&r1=1662229&r2=1662230&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java
Wed Feb 25 14:43:46 2015
@@ -30,8 +30,8 @@ import aQute.bnd.annotation.ConsumerType
* service ranking until one is found which can provide a non-null instance
* <p>
* {@code UseProvider} services are ranked according to the OSGi service
- * registration propertiy {@code service.ranking} which is an integer value.
- * {@code UseProvider} servies with lower ranking values are tried before
+ * registration property {@code service.ranking} which is an integer value.
+ * {@code UseProvider} services with lower ranking values are tried before
* services with higher ranking values. The default value for the ranking if
the
* property is missing is zero.
*/
