This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.models.impl-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
commit ae43b9e95b4f7659ff00a23a7fa0d0f544685beb Author: Justin Edelson <[email protected]> AuthorDate: Fri Jan 31 04:07:01 2014 +0000 SLING-3334 - explicitly rank injectors git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/impl@1563048 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/sling/models/impl/injectors/BindingsInjector.java | 3 +++ .../org/apache/sling/models/impl/injectors/ChildResourceInjector.java | 3 +++ .../org/apache/sling/models/impl/injectors/OSGiServiceInjector.java | 3 +++ .../apache/sling/models/impl/injectors/RequestAttributeInjector.java | 3 +++ .../java/org/apache/sling/models/impl/injectors/ValueMapInjector.java | 3 +++ 5 files changed, 15 insertions(+) diff --git a/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java b/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java index 2a6fcc3..aa5ed5c 100644 --- a/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java +++ b/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java @@ -22,15 +22,18 @@ import java.lang.reflect.Type; import javax.servlet.ServletRequest; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.scripting.SlingBindings; import org.apache.sling.models.spi.DisposalCallbackRegistry; import org.apache.sling.models.spi.Injector; +import org.osgi.framework.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Component @Service +@Property(name = Constants.SERVICE_RANKING, intValue = 1000) public class BindingsInjector implements Injector { private static final Logger log = LoggerFactory.getLogger(BindingsInjector.class); diff --git a/src/main/java/org/apache/sling/models/impl/injectors/ChildResourceInjector.java b/src/main/java/org/apache/sling/models/impl/injectors/ChildResourceInjector.java index 6afec71..194db83 100644 --- a/src/main/java/org/apache/sling/models/impl/injectors/ChildResourceInjector.java +++ b/src/main/java/org/apache/sling/models/impl/injectors/ChildResourceInjector.java @@ -20,13 +20,16 @@ import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.spi.DisposalCallbackRegistry; import org.apache.sling.models.spi.Injector; +import org.osgi.framework.Constants; @Component @Service +@Property(name = Constants.SERVICE_RANKING, intValue = 3000) public class ChildResourceInjector implements Injector { @Override diff --git a/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java b/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java index f19c9ed..78a73bb 100644 --- a/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java +++ b/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java @@ -29,6 +29,7 @@ import javax.servlet.ServletRequest; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.scripting.SlingBindings; import org.apache.sling.api.scripting.SlingScriptHelper; @@ -37,6 +38,7 @@ import org.apache.sling.models.spi.DisposalCallback; import org.apache.sling.models.spi.DisposalCallbackRegistry; import org.apache.sling.models.spi.Injector; import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.service.component.ComponentContext; @@ -45,6 +47,7 @@ import org.slf4j.LoggerFactory; @Component @Service +@Property(name = Constants.SERVICE_RANKING, intValue = 5000) public class OSGiServiceInjector implements Injector { private static final Logger log = LoggerFactory.getLogger(OSGiServiceInjector.class); diff --git a/src/main/java/org/apache/sling/models/impl/injectors/RequestAttributeInjector.java b/src/main/java/org/apache/sling/models/impl/injectors/RequestAttributeInjector.java index ccd7138..fb73063 100644 --- a/src/main/java/org/apache/sling/models/impl/injectors/RequestAttributeInjector.java +++ b/src/main/java/org/apache/sling/models/impl/injectors/RequestAttributeInjector.java @@ -22,14 +22,17 @@ import java.lang.reflect.Type; import javax.servlet.ServletRequest; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Service; import org.apache.sling.models.spi.DisposalCallbackRegistry; import org.apache.sling.models.spi.Injector; +import org.osgi.framework.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Component @Service +@Property(name = Constants.SERVICE_RANKING, intValue = 4000) public class RequestAttributeInjector implements Injector { private static final Logger log = LoggerFactory.getLogger(RequestAttributeInjector.class); diff --git a/src/main/java/org/apache/sling/models/impl/injectors/ValueMapInjector.java b/src/main/java/org/apache/sling/models/impl/injectors/ValueMapInjector.java index f81fb35..f6bea43 100644 --- a/src/main/java/org/apache/sling/models/impl/injectors/ValueMapInjector.java +++ b/src/main/java/org/apache/sling/models/impl/injectors/ValueMapInjector.java @@ -20,16 +20,19 @@ import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.adapter.Adaptable; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.models.spi.DisposalCallbackRegistry; import org.apache.sling.models.spi.Injector; +import org.osgi.framework.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Component @Service +@Property(name = Constants.SERVICE_RANKING, intValue = 2000) public class ValueMapInjector implements Injector { private static final Logger log = LoggerFactory.getLogger(ValueMapInjector.class); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
