You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:22:21 UTC
[sling-org-apache-sling-scripting-sightly-models-provider] branch
master created (now 002c80f)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git.
at 002c80f SLING-7167 Adjust READMEs
This branch includes the following new commits:
new 6385660 SLING-4704 - Move the Sightly scripting engine artifacts from contrib to bundles
new 8222dd8 Update to Sling Parent 23
new 7fc16a9 Remove superflous sling.java.version=6 as it's the default now
new 725a210 set parent version to 24 and add empty relativePath where missing
new 232fc15 SLING-4734 first try to instantiate model with request then with resource
new 9d69881 use released version of Models API
new 5bef3a0 SLING-4734 skip provider as early as possible if the given class is no model
new 9fc455f SLING-5036 - Optimise the ModelsFactoryUseProvider to fail as early as possible if it cannot provide an object
new 5dbba22 SLING-5074 - Provide a way to configure the priority of the Sling Models Use Provider
new 81e00fb Update the main reactor to parent 25
new df511f2 trivial: corrected javadoc
new 7d17218 trivial: corrected javadoc
new dc86631 [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.models.provider-1.0.0
new e11b296 [maven-release-plugin] prepare for next development iteration
new 20c0a02 Switch to parent pom 26
new 2309766 SLING-4734 fix javadoc for the adjusted order of adaptations
new c0060c1 improve logging
new 7aa528b fix typo
new 5bb7977 SLING-5787 - Modularise the Sightly script engine
new 247c27a trivial: improved logging for SlingModelsUseProvider
new 2ea7d52 SLING-6028 - Replace Sightly references with HTL in both code and documentation
new 7195e80 SLING-6033 - Update Sightly bundles to parent pom 28
new dabd150 trivial: configured javadoc plugin
new 628d9cd releng: updated dependencies
new fd01b06 [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.models.provider-1.0.2
new 362fc87 [maven-release-plugin] prepare for next development iteration
new 34c39e6 releng: updated dependencies
new c132ee9 SLING-6125 - Switch HTL to OSGi R6 annotations
new 6dce59b releng: updated dependency
new c00d776 [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.models.provider-1.0.4
new d32b814 [maven-release-plugin] prepare for next development iteration
new 6625283 releng: updated dependencies after release
new 5de9f36 SLING-6390 - Remove metatype info for some HTL OSGi configurations
new 85c002c [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.models.provider-1.0.6
new d73f873 [maven-release-plugin] prepare for next development iteration
new 3bc9eda use Sling Parent 30
new 002c80f SLING-7167 Adjust READMEs
The 37 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-scripting-sightly-models-provider] 17/37:
improve logging
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit c0060c1a81ad8e27e44a1dcdeca675f550e98cf5
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri May 13 07:44:26 2016 +0000
improve logging
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1743611 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/scripting/sightly/models/impl/SlingModelsUseProvider.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 78f5667..0ca99a1 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -122,13 +122,16 @@ public class SlingModelsUseProvider implements UseProvider {
try {
// try to instantiate class via Sling Models (first via request, then via resource)
if (modelFactory.canCreateFromAdaptable(request, cls)) {
+ LOGGER.debug("Trying to instantiate class {} as Sling Model from request.", cls);
return ProviderOutcome.notNullOrFailure(modelFactory.createModel(request, cls));
}
Resource resource = (Resource) globalBindings.get(SlingBindings.RESOURCE);
if (resource == null) {
+ LOGGER.debug("Could not get resource from bindings.");
return ProviderOutcome.failure(new IllegalStateException("Could not get resource from bindings."));
}
if (modelFactory.canCreateFromAdaptable(resource, cls)) {
+ LOGGER.debug("Trying to instantiate class {} as Sling Model from request.", cls);
return ProviderOutcome.notNullOrFailure(modelFactory.createModel(resource, cls));
}
return ProviderOutcome.failure(
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 08/37:
SLING-5036 - Optimise the ModelsFactoryUseProvider to fail as early as
possible if it cannot provide an object
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 9fc455ffe88b63a755498ca4e5188028025f3812
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Sep 17 14:07:19 2015 +0000
SLING-5036 - Optimise the ModelsFactoryUseProvider to fail as early as possible if it cannot provide an object
* renamed ModelsFactoryUseProvider to SlingModelsUseProvider
* delayed all bindings retrievals until they're absolutely necessary
* removed bindings merging - models can get their arguments through request attributes if they're adaptable from SlingHttpServletRequest
* updated the test setup to take into account the SlingModelsUseProvider (both IT and performance)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1703629 13f79535-47bb-0310-9956-ffa450edef68
---
...seProvider.java => SlingModelsUseProvider.java} | 124 +++++++++++----------
1 file changed, 67 insertions(+), 57 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
similarity index 61%
rename from src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
rename to src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 6c81d92..cf8fa3d 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -1,30 +1,29 @@
-/*
+/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ ******************************************************************************/
package org.apache.sling.scripting.sightly.models.impl;
-
import java.util.HashMap;
import java.util.Map;
-
+import java.util.regex.Pattern;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
import javax.servlet.ServletRequest;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -41,83 +40,104 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
+ * <p>
* Sightly {@link UseProvider} which will instantiate a referenced Sling Model.
- * For that it tries to use the {@link ModelFactory#createModel(Object, Class)} first with the adaptable {@link Resource}
+ * </p>
+ * <p>
+ * For that it tries to use the {@link ModelFactory#createModel(Object, Class)} first with the adaptable {@link Resource}
* then with the adaptable {@link SlingHttpServletRequest}.
* It will always fail with an exception (i.e. no other {@code UseProvider} is asked afterwards and the exception is being rethrown)
* in case the following two preconditions are fulfilled:
* <ol>
- * <li>the given identifier specifies a class which can be loaded by the DynamicClassLoader</li>
- * <li>the loaded class has a Model annotation</li>
+ * <li>the given identifier specifies a class which can be loaded by a {@link org.apache.sling.commons.classloader.DynamicClassLoader}</li>
+ * <li>the loaded class has a {@link org.apache.sling.models.annotations.Model} annotation</li>
* </ol>
- * In case any of those preconditions are not fulfilled the other registered UseProviders are used!
+ * </p>
+ * <p>
+ * <p>
+ * In case any of those preconditions are not fulfilled the other registered {@link UseProvider}s will be queried.
+ * </p>
*/
@Component
@Service
-/*
- * must have a higher priority than org.apache.sling.scripting.sightly.impl.engine.extension.use.JavaUseProvider but lower than
- * org.apache.sling.scripting.sightly.impl.engine.extension.use.RenderUnitProvider to kick in
- * before the JavaUseProvider but after the RenderUnitProvider
- */
-@Property(name = Constants.SERVICE_RANKING, intValue = { 95 })
-public class ModelFactoryUseProvider implements UseProvider {
+@Properties({
+ @Property(
+ 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.",
+ /**
+ * Must have a higher priority than {@link org.apache.sling.scripting.sightly.impl.engine.extension.use.JavaUseProvider} but lower
+ * than {@link org.apache.sling.scripting.sightly.impl.engine.extension.use.RenderUnitProvider} to kick in before the
+ * JavaUseProvider but after the RenderUnitProvider.
+ */
+ intValue = 95
+ )
+})
+public class SlingModelsUseProvider implements UseProvider {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(SlingModelsUseProvider.class);
+ private static final Pattern JAVA_PATTERN = Pattern.compile(
+ "([[\\p{L}&&[^\\p{Lu}]]_$][\\p{L}\\p{N}_$]*\\.)*[\\p{Lu}_$][\\p{L}\\p{N}_$]*");
+
- private static final Logger log = LoggerFactory.getLogger(ModelFactoryUseProvider.class);
-
@Reference
- ModelFactory modelFactory;
-
+ private ModelFactory modelFactory = null;
+
@Reference
private DynamicClassLoaderManager dynamicClassLoaderManager = null;
-
+
@Override
public ProviderOutcome provide(final String identifier, final RenderContext renderContext, final Bindings arguments) {
+ if (!JAVA_PATTERN.matcher(identifier).matches()) {
+ LOGGER.debug("Identifier {} does not match a Java class name pattern.", identifier);
+ return ProviderOutcome.failure();
+ }
final Class<?> cls;
try {
cls = dynamicClassLoaderManager.getDynamicClassLoader().loadClass(identifier);
- } catch(ClassNotFoundException e) {
- log.debug("Could not find class with the given name {}: {}", identifier, e.getMessage());
+ } catch (ClassNotFoundException e) {
+ LOGGER.debug("Could not find class with the given name {}: {}", identifier, e.getMessage());
// next use provider will be queried
return ProviderOutcome.failure();
}
if (!modelFactory.isModelClass(cls)) {
- log.debug("{} is no Sling Model (because it lacks the according Model annotation or is not being picked up by the Bundle Listener)!");
+ LOGGER.debug("{} is not a Sling Model.");
// next use provider will be queried
return ProviderOutcome.failure();
}
Bindings globalBindings = renderContext.getBindings();
- Bindings bindings = merge(globalBindings, arguments);
- Resource resource = (Resource) bindings.get(SlingBindings.RESOURCE);
- if (resource == null) {
- return ProviderOutcome.failure(new IllegalStateException("Could not get resource from bindings"));
- }
- SlingHttpServletRequest request = (SlingHttpServletRequest) bindings.get(SlingBindings.REQUEST);
+ SlingHttpServletRequest request = (SlingHttpServletRequest) globalBindings.get(SlingBindings.REQUEST);
if (request == null) {
- return ProviderOutcome.failure(new IllegalStateException("Could not get request from bindings"));
+ return ProviderOutcome.failure(new IllegalStateException("Could not get request from bindings."));
}
-
// pass parameters as request attributes
Map<String, Object> overrides = setRequestAttributes(request, arguments);
- Object obj = null;
+
try {
// try to instantiate class via Sling Models (first via request, then via resource)
if (modelFactory.canCreateFromAdaptable(request, cls)) {
- obj = modelFactory.createModel(request, cls);
- } else if (modelFactory.canCreateFromAdaptable(resource, cls)) {
- obj = modelFactory.createModel(resource, cls);
- } else {
- return ProviderOutcome.failure(new IllegalStateException("Could not adapt the given Sling Model from neither resource nor request: " + cls));
+ return ProviderOutcome.notNullOrFailure(modelFactory.createModel(request, cls));
+ }
+ Resource resource = (Resource) globalBindings.get(SlingBindings.RESOURCE);
+ if (resource == null) {
+ return ProviderOutcome.failure(new IllegalStateException("Could not get resource from bindings."));
}
+ if (modelFactory.canCreateFromAdaptable(resource, cls)) {
+ return ProviderOutcome.notNullOrFailure(modelFactory.createModel(resource, cls));
+ }
+ return ProviderOutcome.failure(
+ new IllegalStateException("Could not adapt the given Sling Model from neither request nor resource: " + cls));
} catch (Throwable e) {
return ProviderOutcome.failure(e);
} finally {
resetRequestAttribute(request, overrides);
+
}
- return ProviderOutcome.notNullOrFailure(obj);
}
- private Map<String, Object> setRequestAttributes(final ServletRequest request,
- final Bindings arguments) {
+ private Map<String, Object> setRequestAttributes(final ServletRequest request, final Bindings arguments) {
Map<String, Object> overrides = new HashMap<String, Object>();
for (Map.Entry<String, Object> entry : arguments.entrySet()) {
String key = entry.getKey();
@@ -125,8 +145,7 @@ public class ModelFactoryUseProvider implements UseProvider {
Object oldValue = request.getAttribute(key);
if (oldValue != null) {
overrides.put(key, oldValue);
- }
- else {
+ } else {
overrides.put(key, null);
}
request.setAttribute(key, value);
@@ -134,24 +153,15 @@ public class ModelFactoryUseProvider implements UseProvider {
return overrides;
}
- private void resetRequestAttribute(final ServletRequest request,
- final Map<String, Object> overrides) {
+ private void resetRequestAttribute(final ServletRequest request, final Map<String, Object> overrides) {
for (Map.Entry<String, Object> entry : overrides.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
if (value == null) {
request.removeAttribute(key);
- }
- else {
+ } else {
request.setAttribute(key, value);
}
}
}
-
- private SimpleBindings merge(Bindings former, Bindings latter) {
- SimpleBindings bindings = new SimpleBindings();
- bindings.putAll(former);
- bindings.putAll(latter);
- return bindings;
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 11/37:
trivial: corrected javadoc
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit df511f2d691b90cb9a72ad99b6032ba469faede7
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 11:02:35 2015 +0000
trivial: corrected javadoc
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1707480 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/scripting/sightly/models/impl/SlingModelsUseProvider.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index fea828f..2643254 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -54,7 +54,6 @@ import org.slf4j.LoggerFactory;
* </ol>
* </p>
* <p>
- * <p>
* In case any of those preconditions are not fulfilled the other registered {@link UseProvider}s will be queried.
* </p>
*/
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 33/37:
SLING-6390 - Remove metatype info for some HTL OSGi configurations
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 5de9f365e9eea7c3427cacfed3c071a52fedd149
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Dec 15 13:23:23 2016 +0000
SLING-6390 - Remove metatype info for some HTL OSGi configurations
* removed metatype annotations; components can still be configured via
sling:OsgiConfig nodes or directly through the ConfigurationAdmin
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774436 13f79535-47bb-0310-9956-ffa450edef68
---
.../scripting/sightly/models/impl/SlingModelsUseProvider.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 2cbee26..1a4104e 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -69,15 +69,8 @@ import org.slf4j.LoggerFactory;
Constants.SERVICE_RANKING + ":Integer=95"
}
)
-@Designate(
- ocd = SlingModelsUseProvider.Configuration.class
-)
public class SlingModelsUseProvider implements UseProvider {
- @ObjectClassDefinition(
- name = "Apache Sling Scripting HTL Sling Models Use Provider Configuration",
- description = "HTL Sling Models Use Provider configuration options"
- )
@interface Configuration {
@AttributeDefinition(
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 36/37:
use Sling Parent 30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 3bc9eda22c91153ad5586a0cbbcb3ed36a13b8e8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:31:22 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785622 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f182264..9f42191 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>28</version>
+ <version>30</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 29/37:
releng: updated dependency
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 6dce59b9be3479c14922833af6c3e940a5a9d683
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Oct 10 16:00:02 2016 +0000
releng: updated dependency
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1764139 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c77fe20..73f6c8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 24/37:
releng: updated dependencies
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 628d9cdba61ec0a68677b04c48aa87cce948b4e4
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Sep 5 15:25:20 2016 +0000
releng: updated dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1759300 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 17c9bd9..9ee67c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 31/37:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit d32b814d566ca4f66e6b8a4e0873232031043bfc
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Oct 10 16:00:42 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1764142 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6efaff0..887e1c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Sling Models Use Provider</name>
@@ -44,9 +44,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.4</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 35/37:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit d73f8739c5948f00f8dabbc70cb6a5573a8d5699
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Dec 15 14:15:26 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774464 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f789fdc..f182264 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Sling Models Use Provider</name>
@@ -44,9 +44,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.6</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.6</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.6</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 25/37:
[maven-release-plugin] prepare release
org.apache.sling.scripting.sightly.models.provider-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit fd01b06ac31f154ca404179b75a650399d083f3d
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Sep 5 15:25:48 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly.models.provider-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1759301 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9ee67c4..3759240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Sling Models Use Provider</name>
@@ -44,9 +44,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.2</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.2</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 32/37:
releng: updated dependencies after release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 6625283edccd994180942fa84765f58839464e38
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Oct 10 16:22:53 2016 +0000
releng: updated dependencies after release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1764150 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 887e1c9..5010c66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId>
- <version>1.0.2</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 22/37:
SLING-6033 - Update Sightly bundles to parent pom 28
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 7195e80bc1a5b6b4555acccec16f5edab201781c
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Sep 2 16:03:35 2016 +0000
SLING-6033 - Update Sightly bundles to parent pom 28
* switched from BND to OSGi annotations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1758984 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index cff5b2b..2c98bc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>28</version>
<relativePath />
</parent>
@@ -73,12 +73,12 @@
<!-- OSGI -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
@@ -121,7 +121,7 @@
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 15/37:
Switch to parent pom 26
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 20c0a02174e39ab89f4b1afbe71fe48e9e3945e3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fcd5e55..a35632b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 30/37:
[maven-release-plugin] prepare release
org.apache.sling.scripting.sightly.models.provider-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit c00d776f661ed1c8f04739da4f7ccaa851fa6c7b
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Oct 10 16:00:26 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly.models.provider-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1764140 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 73f6c8c..6efaff0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Sling Models Use Provider</name>
@@ -44,9 +44,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.4</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.4</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 27/37:
releng: updated dependencies
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 34c39e61f86a8550ffe0b8ceb03ee39b31854b5a
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Sep 5 15:57:11 2016 +0000
releng: updated dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1759318 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 152967d..e633d0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 18/37:
fix typo
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 7aa528ba2aa696791cfc61dc641f3e0188284fca
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri May 13 07:45:09 2016 +0000
fix typo
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1743612 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/scripting/sightly/models/impl/SlingModelsUseProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 0ca99a1..6a5aa17 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -131,7 +131,7 @@ public class SlingModelsUseProvider implements UseProvider {
return ProviderOutcome.failure(new IllegalStateException("Could not get resource from bindings."));
}
if (modelFactory.canCreateFromAdaptable(resource, cls)) {
- LOGGER.debug("Trying to instantiate class {} as Sling Model from request.", cls);
+ LOGGER.debug("Trying to instantiate class {} as Sling Model from resource.", cls);
return ProviderOutcome.notNullOrFailure(modelFactory.createModel(resource, cls));
}
return ProviderOutcome.failure(
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 10/37:
Update the main reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 81e00fbe43a61172f6aa8f3baabe13304aebae8e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 04cddd5..7a8ab91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 02/37:
Update to Sling Parent 23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 8222dd8fd231d32bbe9cf1dfa92ca7a456d8a32e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9b84786..0f6c875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 03/37:
Remove superflous sling.java.version=6 as it's the default now
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 7fc16a9115aba94c9a2ff19e3f490f55cc924bb9
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:14:53 2015 +0000
Remove superflous sling.java.version=6 as it's the default now
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687505 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f6c875..9541f16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,10 +48,6 @@
<url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
</scm>
- <properties>
- <sling.java.version>6</sling.java.version>
- </properties>
-
<!-- ======================================================================= -->
<!-- B U I L D -->
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 09/37:
SLING-5074 - Provide a way to configure the priority of the Sling Models
Use Provider
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 5dbba22699fc2d73c6015439fc8752621815ae5a
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Sep 29 10:02:00 2015 +0000
SLING-5074 - Provide a way to configure the priority of the Sling Models Use Provider
* exposed the service.ranking property through the component's metatype description
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1705827 13f79535-47bb-0310-9956-ffa450edef68
---
.../sightly/models/impl/SlingModelsUseProvider.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index cf8fa3d..fea828f 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -58,21 +58,26 @@ import org.slf4j.LoggerFactory;
* In case any of those preconditions are not fulfilled the other registered {@link UseProvider}s will be queried.
* </p>
*/
-@Component
+@Component(
+ metatype = true,
+ label = "Apache Sling Scripting Sightly Sling Models Use Provider",
+ description = "The Sling Models Use Provider is responsible for instantiating Sling Models to be used with Sightly's Use-API."
+)
@Service
@Properties({
@Property(
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.",
+ "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.",
/**
* Must have a higher priority than {@link org.apache.sling.scripting.sightly.impl.engine.extension.use.JavaUseProvider} but lower
* than {@link org.apache.sling.scripting.sightly.impl.engine.extension.use.RenderUnitProvider} to kick in before the
* JavaUseProvider but after the RenderUnitProvider.
*/
- intValue = 95
+ intValue = 95,
+ propertyPrivate = false
)
})
public class SlingModelsUseProvider implements UseProvider {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 14/37:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit e11b296592d09b5c4d782821f27d2031ff049ca6
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 11:05:33 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1707484 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 599c223..fcd5e55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Models Use Provider</name>
@@ -43,9 +43,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.0</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 01/37:
SLING-4704 - Move the Sightly scripting engine artifacts from contrib to
bundles
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 6385660942d8bc724e898573cbcf1a3b35e06b1f
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue May 12 15:39:47 2015 +0000
SLING-4704 - Move the Sightly scripting engine artifacts from contrib to bundles
* moved Sightly artifacts from contrib to bundles
* updated SCM info
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678979 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 132 +++++++++++++++++
.../models/impl/ModelFactoryUseProvider.java | 157 +++++++++++++++++++++
2 files changed, 289 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..9b84786
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <!-- ======================================================================= -->
+ <!-- P A R E N T P R O J E C T -->
+ <!-- ======================================================================= -->
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>22</version>
+ <relativePath />
+ </parent>
+
+ <!-- ======================================================================= -->
+ <!-- P R O J E C T -->
+ <!-- ======================================================================= -->
+ <artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Scripting Sightly Models Use Provider</name>
+
+ <description>
+ Apache Sling Scripting Sightly Models Use Provider adds support for accessing Sling Models from Sightly's Use-API leveraging the ModelFactory.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
+ </scm>
+
+ <properties>
+ <sling.java.version>6</sling.java.version>
+ </properties>
+
+ <!-- ======================================================================= -->
+ <!-- B U I L D -->
+ <!-- ======================================================================= -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- ======================================================================= -->
+ <!-- D E P E N D E N C I E S -->
+ <!-- ======================================================================= -->
+ <dependencies>
+ <!-- OSGI -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Sling -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.models.api</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Sightly -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.sightly</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.classloader</artifactId>
+ <version>1.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
new file mode 100644
index 0000000..538aca4
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.scripting.sightly.models.impl;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import javax.servlet.ServletRequest;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.scripting.SlingBindings;
+import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
+import org.apache.sling.models.factory.ModelFactory;
+import org.apache.sling.scripting.sightly.render.RenderContext;
+import org.apache.sling.scripting.sightly.use.ProviderOutcome;
+import org.apache.sling.scripting.sightly.use.UseProvider;
+import org.osgi.framework.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Sightly {@link UseProvider} which will instantiate a referenced Sling Model.
+ * For that it tries to use the {@link ModelFactory#createModel(Object, Class)} first with the adaptable {@link Resource}
+ * then with the adaptable {@link SlingHttpServletRequest}.
+ * It will always fail with an exception (i.e. no other {@code UseProvider} is asked afterwards and the exception is being rethrown)
+ * in case the following two preconditions are fulfilled:
+ * <ol>
+ * <li>the given identifier specifies a class which can be loaded by the DynamicClassLoader</li>
+ * <li>the loaded class has a Model annotation</li>
+ * </ol>
+ * In case any of those preconditions are not fulfilled the other registered UseProviders are used!
+ */
+@Component
+@Service
+/*
+ * must have a higher priority than org.apache.sling.scripting.sightly.impl.engine.extension.use.JavaUseProvider but lower than
+ * org.apache.sling.scripting.sightly.impl.engine.extension.use.RenderUnitProvider to kick in
+ * before the JavaUseProvider but after the RenderUnitProvider
+ */
+@Property(name = Constants.SERVICE_RANKING, intValue = { 95 })
+public class ModelFactoryUseProvider implements UseProvider {
+
+ private static final Logger log = LoggerFactory.getLogger(ModelFactoryUseProvider.class);
+
+ @Reference
+ ModelFactory modelFactory;
+
+ @Reference
+ private DynamicClassLoaderManager dynamicClassLoaderManager = null;
+
+ @Override
+ public ProviderOutcome provide(final String identifier, final RenderContext renderContext, final Bindings arguments) {
+ final Class<?> cls;
+ try {
+ cls = dynamicClassLoaderManager.getDynamicClassLoader().loadClass(identifier);
+ } catch(ClassNotFoundException e) {
+ log.debug("Could not find class with the given name {}: {}", identifier, e.getMessage());
+ // next use provider will be queried
+ return ProviderOutcome.failure();
+ }
+ Bindings globalBindings = renderContext.getBindings();
+ Bindings bindings = merge(globalBindings, arguments);
+ Resource resource = (Resource) bindings.get(SlingBindings.RESOURCE);
+ if (resource == null) {
+ return ProviderOutcome.failure(new IllegalStateException("Could not get resource from bindings"));
+ }
+ SlingHttpServletRequest request = (SlingHttpServletRequest) bindings.get(SlingBindings.REQUEST);
+ if (request == null) {
+ return ProviderOutcome.failure(new IllegalStateException("Could not get request from bindings"));
+ }
+
+ // pass parameters as request attributes
+ Map<String, Object> overrides = setRequestAttributes(request, arguments);
+ Object obj = null;
+ try {
+ if (!modelFactory.isModelClass(resource, cls)) {
+ log.debug("{} is no Sling Model (because it lacks the according Model annotation)!");
+ // next use provider will be queried
+ return ProviderOutcome.failure();
+ }
+ // try to instantiate class via Sling Models (first via resource, then via request)
+ if (modelFactory.canCreateFromAdaptable(resource, cls)) {
+ obj = modelFactory.createModel(resource, cls);
+ } else if (modelFactory.canCreateFromAdaptable(request, cls)) {
+ obj = modelFactory.createModel(request, cls);
+ } else {
+ return ProviderOutcome.failure(new IllegalStateException("Could not adapt the given Sling Model from neither resource nor request: " + cls));
+ }
+ } catch (Throwable e) {
+ return ProviderOutcome.failure(e);
+ } finally {
+ resetRequestAttribute(request, overrides);
+ }
+ return ProviderOutcome.notNullOrFailure(obj);
+ }
+
+ private Map<String, Object> setRequestAttributes(final ServletRequest request,
+ final Bindings arguments) {
+ Map<String, Object> overrides = new HashMap<String, Object>();
+ for (Map.Entry<String, Object> entry : arguments.entrySet()) {
+ String key = entry.getKey();
+ Object value = entry.getValue();
+ Object oldValue = request.getAttribute(key);
+ if (oldValue != null) {
+ overrides.put(key, oldValue);
+ }
+ else {
+ overrides.put(key, null);
+ }
+ request.setAttribute(key, value);
+ }
+ return overrides;
+ }
+
+ private void resetRequestAttribute(final ServletRequest request,
+ final Map<String, Object> overrides) {
+ for (Map.Entry<String, Object> entry : overrides.entrySet()) {
+ String key = entry.getKey();
+ Object value = entry.getValue();
+ if (value == null) {
+ request.removeAttribute(key);
+ }
+ else {
+ request.setAttribute(key, value);
+ }
+ }
+ }
+
+ private SimpleBindings merge(Bindings former, Bindings latter) {
+ SimpleBindings bindings = new SimpleBindings();
+ bindings.putAll(former);
+ bindings.putAll(latter);
+ return bindings;
+ }
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 06/37:
use released version of Models API
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 9d6988129c1102d538428af3cbd657e3fcb95427
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Sep 1 14:00:56 2015 +0000
use released version of Models API
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1700552 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 53fbae3..218f80c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.api</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 13/37:
[maven-release-plugin] prepare release
org.apache.sling.scripting.sightly.models.provider-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit dc8663170522a4542bd683e1dc2a401f220621fb
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 11:05:16 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly.models.provider-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1707482 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a8ab91..599c223 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,14 +26,14 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>25</version>
- <relativePath/>
+ <relativePath />
</parent>
<!-- ======================================================================= -->
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Models Use Provider</name>
@@ -43,9 +43,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.0</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.0</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 21/37:
SLING-6028 - Replace Sightly references with HTL in both code and
documentation
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 2ea7d52f0ef30c5a61ccfd0334995db485c0b1b6
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Sep 2 14:51:07 2016 +0000
SLING-6028 - Replace Sightly references with HTL in both code and documentation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1758968 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 6 ++++++
pom.xml | 7 ++++---
.../scripting/sightly/models/impl/SlingModelsUseProvider.java | 4 ++--
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5cc4c9b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+Apache Sling Scripting HTL Sling Models Use Provider
+==================================================
+
+The Apache Sling Scripting HTL Sling Models Use Provider adds support for accessing
+[Sling Models](https://sling.apache.org/documentation/bundles/models.html)
+from HTL's Use-API leveraging the `ModelFactory`.
diff --git a/pom.xml b/pom.xml
index d601f41..cff5b2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,10 +36,11 @@
<version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Sling Scripting Sightly Models Use Provider</name>
+ <name>Apache Sling Scripting HTL Sling Models Use Provider</name>
<description>
- Apache Sling Scripting Sightly Models Use Provider adds support for accessing Sling Models from Sightly's Use-API leveraging the ModelFactory.
+ Apache Sling Scripting HTL Sling Models Use Provider adds support for accessing Sling Models from HTL's Use-API leveraging the
+ ModelFactory.
</description>
<scm>
@@ -96,7 +97,7 @@
<scope>provided</scope>
</dependency>
- <!-- Sightly -->
+ <!-- HTL -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId>
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 38a0e00..1de27bf 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
/**
* <p>
- * Sightly {@link UseProvider} which will instantiate a referenced Sling Model.
+ * HTL {@link UseProvider} which will instantiate a referenced Sling Model.
* </p>
* <p>
* For that it tries to use the {@link ModelFactory#createModel(Object, Class)} first with the adaptable {@link SlingHttpServletRequest}
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
*/
@Component(
metatype = true,
- label = "Apache Sling Scripting Sightly Sling Models Use Provider",
+ label = "Apache Sling Scripting HTL Sling Models Use Provider",
description = "The Sling Models Use Provider is responsible for instantiating Sling Models to be used with Sightly's Use-API."
)
@Service
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 16/37:
SLING-4734 fix javadoc for the adjusted order of adaptations
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 2309766e80c4491e553bd806136701f0a956528e
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Jan 21 18:07:39 2016 +0000
SLING-4734 fix javadoc for the adjusted order of adaptations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1726044 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/scripting/sightly/models/impl/SlingModelsUseProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 01a387d..78f5667 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -44,8 +44,8 @@ import org.slf4j.LoggerFactory;
* Sightly {@link UseProvider} which will instantiate a referenced Sling Model.
* </p>
* <p>
- * For that it tries to use the {@link ModelFactory#createModel(Object, Class)} first with the adaptable {@link Resource}
- * then with the adaptable {@link SlingHttpServletRequest}. It will always fail with an exception (i.e. no other {@code UseProvider} is
+ * For that it tries to use the {@link ModelFactory#createModel(Object, Class)} first with the adaptable {@link SlingHttpServletRequest}
+ * then with the adaptable {@link Resource}. It will always fail with an exception (i.e. no other {@code UseProvider} is
* asked afterwards and the exception is being rethrown) in case the following two preconditions are fulfilled:
* </p>
* <ol>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 07/37:
SLING-4734 skip provider as early as possible if the given class is no
model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 5bef3a07400e4a164b820e4b5ce05fc9677c0e59
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Sep 17 06:58:24 2015 +0000
SLING-4734 skip provider as early as possible if the given class is no model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1703499 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../sightly/models/impl/ModelFactoryUseProvider.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 218f80c..04cddd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.api</artifactId>
- <version>1.2.0</version>
+ <version>1.2.2</version>
<scope>provided</scope>
</dependency>
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
index 07c495b..6c81d92 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
@@ -80,6 +80,11 @@ public class ModelFactoryUseProvider implements UseProvider {
// next use provider will be queried
return ProviderOutcome.failure();
}
+ if (!modelFactory.isModelClass(cls)) {
+ log.debug("{} is no Sling Model (because it lacks the according Model annotation or is not being picked up by the Bundle Listener)!");
+ // next use provider will be queried
+ return ProviderOutcome.failure();
+ }
Bindings globalBindings = renderContext.getBindings();
Bindings bindings = merge(globalBindings, arguments);
Resource resource = (Resource) bindings.get(SlingBindings.RESOURCE);
@@ -90,16 +95,11 @@ public class ModelFactoryUseProvider implements UseProvider {
if (request == null) {
return ProviderOutcome.failure(new IllegalStateException("Could not get request from bindings"));
}
-
+
// pass parameters as request attributes
Map<String, Object> overrides = setRequestAttributes(request, arguments);
Object obj = null;
try {
- if (!modelFactory.isModelClass(resource, cls)) {
- log.debug("{} is no Sling Model (because it lacks the according Model annotation)!");
- // next use provider will be queried
- return ProviderOutcome.failure();
- }
// try to instantiate class via Sling Models (first via request, then via resource)
if (modelFactory.canCreateFromAdaptable(request, cls)) {
obj = modelFactory.createModel(request, cls);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 28/37:
SLING-6125 - Switch HTL to OSGi R6 annotations
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit c132ee9da9f06054572868d0bb617199eca70bc8
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Oct 10 15:39:09 2016 +0000
SLING-6125 - Switch HTL to OSGi R6 annotations
* removed maven-scr-plugin and configured maven-bundle-plugin to generate SCR metadata
* replaced Felix SCR annotations with OSGi Component + Metatype annotations
* removed unused dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1764122 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 18 +++++--
.../models/impl/SlingModelsUseProvider.java | 59 ++++++++++++----------
2 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index e633d0a..c77fe20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,12 +56,22 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>scr-metadata</id>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <exportScr>true</exportScr>
+ <instructions>
+ <Require-Capability>io.sightly; filter:="(&(version>=1.0)(!(version>=2.0)))"</Require-Capability>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 1de27bf..2cbee26 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -22,11 +22,6 @@ import java.util.regex.Pattern;
import javax.script.Bindings;
import javax.servlet.ServletRequest;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.scripting.SlingBindings;
@@ -36,6 +31,11 @@ import org.apache.sling.scripting.sightly.render.RenderContext;
import org.apache.sling.scripting.sightly.use.ProviderOutcome;
import org.apache.sling.scripting.sightly.use.UseProvider;
import org.osgi.framework.Constants;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,29 +58,36 @@ import org.slf4j.LoggerFactory;
* </p>
*/
@Component(
- metatype = true,
- label = "Apache Sling Scripting HTL Sling Models Use Provider",
- description = "The Sling Models Use Provider is responsible for instantiating Sling Models to be used with Sightly's Use-API."
+ service = UseProvider.class,
+ configurationPid = "org.apache.sling.scripting.sightly.models.impl.SlingModelsUseProvider",
+ property = {
+ /**
+ * Must have a higher priority than {@link org.apache.sling.scripting.sightly.impl.engine.extension.use.JavaUseProvider} but lower
+ * than {@link org.apache.sling.scripting.sightly.impl.engine.extension.use.RenderUnitProvider} to kick in before the
+ * JavaUseProvider but after the RenderUnitProvider.
+ */
+ Constants.SERVICE_RANKING + ":Integer=95"
+ }
+)
+@Designate(
+ ocd = SlingModelsUseProvider.Configuration.class
)
-@Service
-@Properties({
- @Property(
- 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.",
- /**
- * Must have a higher priority than {@link org.apache.sling.scripting.sightly.impl.engine.extension.use.JavaUseProvider} but lower
- * than {@link org.apache.sling.scripting.sightly.impl.engine.extension.use.RenderUnitProvider} to kick in before the
- * JavaUseProvider but after the RenderUnitProvider.
- */
- intValue = 95,
- propertyPrivate = false
- )
-})
public class SlingModelsUseProvider implements UseProvider {
+ @ObjectClassDefinition(
+ name = "Apache Sling Scripting HTL Sling Models Use Provider Configuration",
+ description = "HTL Sling Models Use Provider configuration options"
+ )
+ @interface Configuration {
+
+ @AttributeDefinition(
+ name = "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."
+ )
+ int service_ranking() default 95;
+ }
+
private static final Logger LOGGER = LoggerFactory.getLogger(SlingModelsUseProvider.class);
private static final Pattern JAVA_PATTERN = Pattern.compile(
"([[\\p{L}&&[^\\p{Lu}]]_$][\\p{L}\\p{N}_$]*\\.)*[\\p{Lu}_$][\\p{L}\\p{N}_$]*");
@@ -145,7 +152,7 @@ public class SlingModelsUseProvider implements UseProvider {
}
private Map<String, Object> setRequestAttributes(final ServletRequest request, final Bindings arguments) {
- Map<String, Object> overrides = new HashMap<String, Object>();
+ Map<String, Object> overrides = new HashMap<>();
for (Map.Entry<String, Object> entry : arguments.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 05/37:
SLING-4734 first try to instantiate model with request then with resource
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 232fc15a2a33ea9c61c542a791f0522046cbb76d
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Sep 1 13:54:19 2015 +0000
SLING-4734 first try to instantiate model with request then with resource
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1700549 13f79535-47bb-0310-9956-ffa450edef68
---
.../scripting/sightly/models/impl/ModelFactoryUseProvider.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
index 538aca4..07c495b 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/ModelFactoryUseProvider.java
@@ -100,11 +100,11 @@ public class ModelFactoryUseProvider implements UseProvider {
// next use provider will be queried
return ProviderOutcome.failure();
}
- // try to instantiate class via Sling Models (first via resource, then via request)
- if (modelFactory.canCreateFromAdaptable(resource, cls)) {
- obj = modelFactory.createModel(resource, cls);
- } else if (modelFactory.canCreateFromAdaptable(request, cls)) {
+ // try to instantiate class via Sling Models (first via request, then via resource)
+ if (modelFactory.canCreateFromAdaptable(request, cls)) {
obj = modelFactory.createModel(request, cls);
+ } else if (modelFactory.canCreateFromAdaptable(resource, cls)) {
+ obj = modelFactory.createModel(resource, cls);
} else {
return ProviderOutcome.failure(new IllegalStateException("Could not adapt the given Sling Model from neither resource nor request: " + cls));
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 19/37:
SLING-5787 - Modularise the Sightly script engine
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 5bb79775340ae8516e8080d2ccb95cb02361a5fe
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Jun 16 16:07:57 2016 +0000
SLING-5787 - Modularise the Sightly script engine
* implemented front-end + back-end compilers
* added new dependency to the JavaScript + Sling Models use providers in order
to use version 2.0.0 of the org.apache.sling.scripting.sightly.render API package
* adapted tests
(closes #147)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1748750 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index a35632b..d601f41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,8 +99,8 @@
<!-- Sightly -->
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.scripting.sightly</artifactId>
- <version>1.0.0</version>
+ <artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 20/37:
trivial: improved logging for SlingModelsUseProvider
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 247c27a0c9521d2c6ba6092fc29e1123da8771ef
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Jul 19 13:53:09 2016 +0000
trivial: improved logging for SlingModelsUseProvider
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1753390 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/scripting/sightly/models/impl/SlingModelsUseProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 6a5aa17..38a0e00 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -102,7 +102,7 @@ public class SlingModelsUseProvider implements UseProvider {
try {
cls = dynamicClassLoaderManager.getDynamicClassLoader().loadClass(identifier);
} catch (ClassNotFoundException e) {
- LOGGER.debug("Could not find class with the given name {}: {}", identifier, e.getMessage());
+ LOGGER.debug("Could not find class with the given name {}.", identifier);
// next use provider will be queried
return ProviderOutcome.failure();
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 34/37:
[maven-release-plugin] prepare release
org.apache.sling.scripting.sightly.models.provider-1.0.6
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 85c002c7e381652f51ed6340dc5690321ce70d84
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Dec 15 14:15:10 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly.models.provider-1.0.6
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774462 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5010c66..f789fdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.6</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Sling Models Use Provider</name>
@@ -44,9 +44,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.6</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.6</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.6</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 04/37:
set parent version to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 725a21037b1106bd9a7dda27b35b0a040691dccd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9541f16..53fbae3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
- <relativePath />
+ <version>24</version>
+ <relativePath/>
</parent>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 23/37:
trivial: configured javadoc plugin
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit dabd15030d2055fad93bc5292bdd3980f4647c8e
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Sep 5 15:05:35 2016 +0000
trivial: configured javadoc plugin
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1759284 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pom.xml b/pom.xml
index 2c98bc2..17c9bd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,16 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- No javadocs -->
+ <excludePackageNames>
+ org.apache.sling.scripting.sightly.models.impl
+ </excludePackageNames>
+ </configuration>
+ </plugin>
</plugins>
</build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 26/37:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 362fc87f0fa127319bd3952a47478957df43f24d
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Sep 5 15:26:02 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1759303 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3759240..152967d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting HTL Sling Models Use Provider</name>
@@ -44,9 +44,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.2</developerConnection>
- <url>http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.models.provider-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</developerConnection>
+ <url>http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/models-use-provider</url>
</scm>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 12/37:
trivial: corrected javadoc
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 7d172188161df6e09606cf352e0ce291ed4aef23
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 11:04:47 2015 +0000
trivial: corrected javadoc
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1707481 13f79535-47bb-0310-9956-ffa450edef68
---
.../scripting/sightly/models/impl/SlingModelsUseProvider.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
index 2643254..01a387d 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/models/impl/SlingModelsUseProvider.java
@@ -45,14 +45,14 @@ import org.slf4j.LoggerFactory;
* </p>
* <p>
* For that it tries to use the {@link ModelFactory#createModel(Object, Class)} first with the adaptable {@link Resource}
- * then with the adaptable {@link SlingHttpServletRequest}.
- * It will always fail with an exception (i.e. no other {@code UseProvider} is asked afterwards and the exception is being rethrown)
- * in case the following two preconditions are fulfilled:
+ * then with the adaptable {@link SlingHttpServletRequest}. It will always fail with an exception (i.e. no other {@code UseProvider} is
+ * asked afterwards and the exception is being rethrown) in case the following two preconditions are fulfilled:
+ * </p>
* <ol>
* <li>the given identifier specifies a class which can be loaded by a {@link org.apache.sling.commons.classloader.DynamicClassLoader}</li>
* <li>the loaded class has a {@link org.apache.sling.models.annotations.Model} annotation</li>
* </ol>
- * </p>
+ *
* <p>
* In case any of those preconditions are not fulfilled the other registered {@link UseProvider}s will be queried.
* </p>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-models-provider] 37/37:
SLING-7167 Adjust READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-models-provider.git
commit 002c80f67987f41d63130481dfe875d96c487647
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 10:00:58 2017 +0000
SLING-7167 Adjust READMEs
add uniform header linking to Sling project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810879 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 5cc4c9b..26e0019 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
-Apache Sling Scripting HTL Sling Models Use Provider
-==================================================
+# Apache Sling Scripting HTL Sling Models Use Provider
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
The Apache Sling Scripting HTL Sling Models Use Provider adds support for accessing
[Sling Models](https://sling.apache.org/documentation/bundles/models.html)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.