Author: radu
Date: Wed Feb 25 18:12:48 2015
New Revision: 1662289
URL: http://svn.apache.org/r1662289
Log:
SLING-4454 - Contradicting information about service.ranking in UseProvider and
JavaUseProvider
* corrected information about service.ranking usage in UseProvider
* reverted r1662230
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=1662289&r1=1662288&r2=1662289&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 18:12:48 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. The lower the value, the earlier the Use
Provider is asked.",
+ "Use-object. A higher value represents a higher
priority.",
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=1662289&r1=1662288&r2=1662289&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 18:12:48 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. The lower the value, the earlier the Use
Provider is asked.",
+ "Use-object. A higher value represents a higher
priority.",
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=1662289&r1=1662288&r2=1662289&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 18:12:48 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. The lower the value, the earlier the Use
Provider is asked.",
+ "Use-object. A higher value represents a higher
priority.",
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=1662289&r1=1662288&r2=1662289&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 18:12:48 2015
@@ -22,27 +22,28 @@ package org.apache.sling.scripting.sight
import javax.script.Bindings;
import org.apache.sling.scripting.sightly.render.RenderContext;
+import org.osgi.framework.Constants;
import aQute.bnd.annotation.ConsumerType;
/**
- * Provides instances for the use API. Providers are tried in the order of
their
- * 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 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.
+ * A {@code UseProvider} instantiates objects for the Use-API. Providers are
queried in the descending order of their
+ * {@link Constants#SERVICE_RANKING service ranking} until one is found which
can provide a non-null instance.
+ * </p>
+ * <p>
+ * The default value for the ranking if the property is missing is zero.
+ * </p>
*/
@ConsumerType
public interface UseProvider {
/**
* Provide an instance based on the given identifier
- * @param identifier the identifier of the dependency
+ *
+ * @param identifier the identifier of the dependency
* @param renderContext the current rendering context
- * @param arguments Specific arguments provided by the use plugin
+ * @param arguments Specific arguments provided by the use plugin
* @return a container with the instance that corresponds to the
identifier. If the identifier cannot be
* handled by this provider, a failed outcome is returned
*/
