Jenkins build became unstable: sling-bundles-extensions-caconfig-integration-tests-1.8 #957

[Apache Jenkins Server]

See 

Jenkins build is back to stable : sling-launchpad-testing-1.8 #475

[Apache Jenkins Server]

See 

Jenkins build is back to stable : sling-bundles-extensions-caconfig-integration-tests-1.8 #958

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-1.8 #481

[Apache Jenkins Server]

See 

Jenkins build is still unstable: sling-launchpad-testing-1.8 #482

[Apache Jenkins Server]

See 

svn commit: r1779629 - /sling/trunk/bundles/resourceresolver/pom.xml

[cziegeler]

Author: cziegeler
Date: Fri Jan 20 14:42:57 2017
New Revision: 1779629

URL: http://svn.apache.org/viewvc?rev=1779629=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/resourceresolver/pom.xml

Modified: sling/trunk/bundles/resourceresolver/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1779629=1779628=1779629=diff
==
--- sling/trunk/bundles/resourceresolver/pom.xml (original)
+++ sling/trunk/bundles/resourceresolver/pom.xml Fri Jan 20 14:42:57 2017
@@ -27,7 +27,7 @@
 
 
 org.apache.sling.resourceresolver
-1.5.12
+1.5.13-SNAPSHOT
 bundle
 
 Apache Sling Resource Resolver
@@ -37,13 +37,13 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.5.12
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver
 
 
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.5.12
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver
 
 
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourceresolver-1.5.12
+http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver
 
 
 

svn commit: r1779628 - /sling/tags/org.apache.sling.resourceresolver-1.5.12/

[cziegeler]

Author: cziegeler
Date: Fri Jan 20 14:42:55 2017
New Revision: 1779628

URL: http://svn.apache.org/viewvc?rev=1779628=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.resourceresolver-1.5.12

Added:
sling/tags/org.apache.sling.resourceresolver-1.5.12/   (props changed)
  - copied from r1779627, sling/trunk/bundles/resourceresolver/

Propchange: sling/tags/org.apache.sling.resourceresolver-1.5.12/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jan 20 14:42:55 2017
@@ -0,0 +1,11 @@
+target
+bin
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml

Propchange: sling/tags/org.apache.sling.resourceresolver-1.5.12/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 20 14:42:55 2017
@@ -0,0 +1,2 @@
+/sling/whiteboard/fmeschbe/deprecate_login_administrative/resourceresolver:1458693-1499675
+/sling/whiteboard/fmeschbe/featureflags/resourceresolver:1559092-1562000

svn commit: r1779627 - /sling/trunk/bundles/resourceresolver/pom.xml

[cziegeler]

Author: cziegeler
Date: Fri Jan 20 14:42:41 2017
New Revision: 1779627

URL: http://svn.apache.org/viewvc?rev=1779627=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.resourceresolver-1.5.12

Modified:
sling/trunk/bundles/resourceresolver/pom.xml

Modified: sling/trunk/bundles/resourceresolver/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1779627=1779626=1779627=diff
==
--- sling/trunk/bundles/resourceresolver/pom.xml (original)
+++ sling/trunk/bundles/resourceresolver/pom.xml Fri Jan 20 14:42:41 2017
@@ -27,7 +27,7 @@
 
 
 org.apache.sling.resourceresolver
-1.5.11-SNAPSHOT
+1.5.12
 bundle
 
 Apache Sling Resource Resolver
@@ -37,13 +37,13 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.5.12
 
 
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.5.12
 
 
-http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourceresolver-1.5.12
 
 
 

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Resource Resolver 1.5.12Deployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.7.0_80; Mac OS X 10.12.2)""userId" = "cziegeler""ip" = "193.104.215.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.resourceresolver/1.5.12/org.apache.sling.resourceresolver-1.5.12.pom(SHA1: e1195724e1a1e70f55ab0e84a21090c44ac0cfe9)/org/apache/sling/org.apache.sling.resourceresolver/1.5.12/org.apache.sling.resourceresolver-1.5.12-source-release.zip(SHA1: eaaf2b152250fd24093fe688758efe024e655b26)/org/apache/sling/org.apache.sling.resourceresolver/1.5.12/org.apache.sling.resourceresolver-1.5.12-sources.jar.asc(SHA1: bb08abc4ee0c43b2ec0f1cd77e69aca31dcada3c)/org/apache/sling/org.apache.sling.resourceresolver/1.5.12/org.apache.sling.resourceresolver-1.5.12-sources.jar(SHA1: a478b1c7ebfcc06491ba3a1910bbef5b00283902)/org/apache/sling/org.apache.sling.resourceresolver/1.5.12/org.apache.sling.resourceresolver-1.5.12.jar.asc(SHA1: 58615f82715ab9d0c19856b45023a7c177266e35)/org/apache/sling/org.apache.sling.resourceresolver/1.5.12/org.apache.sling.resourceresolver-1.5.12-source-release.zip.asc(SHA1: 04b478595d98e9caf96ce55e13420e4518cfedb8)/org/apache/sling/org.apache.sling.resourceresolver/1.5.12/org.apache.sling.resourceresolver-1.5.12.jar(SHA1: 510d267039018a31d5a8cff68110a5456b7e5422)/org/apache/sling/org.apache.sling.resourceresolver/1.5.12/org.apache.sling.resourceresolver-1.5.12.pom.asc(SHA1: 90b5f3784127838af754cd27e5edf93a629df36c)Action performed by Carsten Ziegeler (cziegeler)

Jenkins build is still unstable: sling-launchpad-testing-1.8 #483

[Apache Jenkins Server]

See 

Jenkins build is back to stable : sling-launchpad-testing-1.8 #470

[Apache Jenkins Server]

See 

Jenkins build is back to stable : sling-launchpad-testing-1.8 #472

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-1.8 #469

[Apache Jenkins Server]

See 

Jenkins build is back to stable : sling-launchpad-testing-war-1.8 #466

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-1.8 #474

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-1.8 #471

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-war-1.8 #465

[Apache Jenkins Server]

See 

svn commit: r1779585 - in /sling/trunk/bundles/scripting/sightly: engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ testing-content/src/main/resources/SLING-INF/ testing-c

[radu]

Author: radu
Date: Fri Jan 20 09:07:42 2017
New Revision: 1779585

URL: http://svn.apache.org/viewvc?rev=1779585=rev
Log:
SLING-6476 - [HTL] data-sly-resource transforms resources with dots in their 
paths to SyntheticResources

* check if the resource identified by the path exists so that we don’t run path 
analysis which on it, which might
transform it into a SyntheticResource

Added:

sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/renderer/

sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/renderer/renderer.html

sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/renderer/renderer.js
Modified:

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java

sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html

sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/sightly.json

sling/trunk/bundles/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/SlingSpecificsSightlyIT.java

Modified: 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java?rev=1779585=1779584=1779585=diff
==
--- 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java
 Fri Jan 20 09:07:42 2017
@@ -40,6 +40,7 @@ import org.apache.sling.scripting.sightl
 import org.apache.sling.scripting.sightly.extension.RuntimeExtension;
 import org.apache.sling.scripting.sightly.impl.utils.BindingsUtils;
 import org.apache.sling.scripting.sightly.render.RenderContext;
+import org.apache.sling.scripting.sightly.render.RuntimeObjectModel;
 import org.osgi.service.component.annotations.Component;
 
 /**
@@ -74,28 +75,49 @@ public class ResourceRuntimeExtension im
 final Bindings bindings = renderContext.getBindings();
 SlingHttpServletRequest request = BindingsUtils.getRequest(bindings);
 Map originalAttributes = ExtensionUtils.setRequestAttributes(request, 
(Map)options.remove(OPTION_REQUEST_ATTRIBUTES));
-String resourceType = coerceString(getAndRemoveOption(opts, 
OPTION_RESOURCE_TYPE));
+RuntimeObjectModel runtimeObjectModel = renderContext.getObjectModel();
+String resourceType = 
runtimeObjectModel.toString(getAndRemoveOption(opts, OPTION_RESOURCE_TYPE));
 StringWriter writer = new StringWriter();
 PrintWriter printWriter = new PrintWriter(writer);
 if (pathObj instanceof Resource) {
-Resource includeRes = (Resource) pathObj;
-Map dispatcherOptionsMap = 
handleSelectors(bindings, new LinkedHashSet(), opts);
+Resource includedResource = (Resource) pathObj;
+Map dispatcherOptionsMap = 
handleSelectors(request, new LinkedHashSet(), opts, runtimeObjectModel);
 String dispatcherOptions = 
createDispatcherOptions(dispatcherOptionsMap);
-includeResource(bindings, printWriter, includeRes, 
dispatcherOptions, resourceType);
+includeResource(bindings, printWriter, includedResource, 
dispatcherOptions, resourceType);
 } else {
-PathInfo pathInfo = new PathInfo(coerceString(pathObj));
-String finalPath = buildPath(pathInfo.path, opts, 
BindingsUtils.getResource(bindings));
-Map dispatcherOptionsMap = 
handleSelectors(bindings, pathInfo.selectors, opts);
-String dispatcherOptions = 
createDispatcherOptions(dispatcherOptionsMap);
-includeResource(bindings, printWriter, finalPath, 
dispatcherOptions, resourceType);
+String includePath = runtimeObjectModel.toString(pathObj);
+// build path completely
+includePath = buildPath(includePath, options, 
request.getResource());
+if (includePath != null) {
+// check if path identifies an existing resource
+Resource includedResource = 
request.getResourceResolver().getResource(includePath);
+PathInfo pathInfo;
+if (includedResource != null) {
+Map dispatcherOptionsMap =
+handleSelectors(request, 

svn commit: r1779586 - in /sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts: includedresource/includedresource.html resource/dot.html text/text.h

[radu]

Author: radu
Date: Fri Jan 20 09:07:47 2017
New Revision: 1779586

URL: http://svn.apache.org/viewvc?rev=1779586=rev
Log:
trivial: removed HTML comments from test files

Modified:

sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/includedresource/includedresource.html

sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/dot.html

sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/text/text.html

Modified: 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/includedresource/includedresource.html
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/includedresource/includedresource.html?rev=1779586=1779585=1779586=diff
==
--- 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/includedresource/includedresource.html
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/includedresource/includedresource.html
 Fri Jan 20 09:07:47 2017
@@ -1,4 +1,4 @@
-
+  
~*/-->
 path: ${resource.path}
-selectors: 
${request.requestPathInfo.selectorString}
\ No newline at end of file
+selectors: 
${request.requestPathInfo.selectorString}

Modified: 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/dot.html
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/dot.html?rev=1779586=1779585=1779586=diff
==
--- 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/dot.html
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/dot.html
 Fri Jan 20 09:07:47 2017
@@ -1,4 +1,4 @@
-
-It works
\ No newline at end of file
+  
~*/-->
+It works

Modified: 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/text/text.html
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/text/text.html?rev=1779586=1779585=1779586=diff
==
--- 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/text/text.html
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/text/text.html
 Fri Jan 20 09:07:47 2017
@@ -1,4 +1,4 @@
-
+  
~*/-->
 path: ${resource.path}
-selectors: 
${request.requestPathInfo.selectorString}
\ No newline at end of file
+selectors: 
${request.requestPathInfo.selectorString}