svn commit: r1701026 - in /sling/trunk: bundles/jcr/it-jackrabbit-oak/pom.xml bundles/jcr/oak-server/pom.xml bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.

2015-09-03 Thread bdelacretaz
Author: bdelacretaz
Date: Thu Sep  3 13:50:39 2015
New Revision: 1701026

URL: http://svn.apache.org/r1701026
Log:
SLING-4995 - upgrade to Oak 1.3.4

Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
sling/trunk/bundles/jcr/oak-server/pom.xml

sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java
sling/trunk/launchpad/builder/src/main/provisioning/oak.txt

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1701026=1701025=1701026=diff
==
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Thu Sep  3 13:50:39 2015
@@ -50,7 +50,7 @@
 WARNING make sure oak.version and sling.oak.server.version 
 are in sync with bundles/jcr/oak-server
 -->
-1.3.3
+1.3.4
 ${project.version}
 
 

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1701026=1701025=1701026=diff
==
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Thu Sep  3 13:50:39 2015
@@ -41,7 +41,7 @@
 WARNING make sure oak.version and sling.oak.server.version 
 are in sync with bundles/jcr/it-jackrabbit-oak
 -->
-1.3.3
+1.3.4
 
 
 

Modified: 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java?rev=1701026=1701025=1701026=diff
==
--- 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java
 Thu Sep  3 13:50:39 2015
@@ -250,7 +250,10 @@ public class OakSlingRepositoryManager e
 }
 
 final ContentRepository contentRepository = 
oak.createContentRepository();
-return new OsgiRepository(contentRepository, whiteboard, 
securityProvider, observationQueueLength, commitRateLimiter);
+final boolean fastQueryResultSize = true;
+return new OsgiRepository(
+contentRepository, whiteboard, securityProvider, 
observationQueueLength, 
+commitRateLimiter, fastQueryResultSize);
 }
 
 @Override

Modified: sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/oak.txt?rev=1701026=1701025=1701026=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Thu Sep  3 
13:50:39 2015
@@ -20,7 +20,7 @@
 [feature name=oak]
 
 [variables]
-oak.version=1.3.3
+oak.version=1.3.4
 
 # The segment node store is used via a configuration
 [artifacts startLevel=10 runModes=oak]




svn commit: r1701047 [2/2] - in /sling/trunk/bundles/scripting/sightly/engine/src: main/java/org/apache/sling/scripting/sightly/impl/compiled/ main/java/org/apache/sling/scripting/sightly/impl/compile

2015-09-03 Thread radu
Copied: 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/utils/RenderUtils.java
 (from r1701042, 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderContextImpl.java)
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/utils/RenderUtils.java?p2=sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/utils/RenderUtils.java=sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderContextImpl.java=1701042=1701047=1701047=diff
==
--- 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderContextImpl.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/utils/RenderUtils.java
 Thu Sep  3 15:13:39 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  
**/
-package org.apache.sling.scripting.sightly.impl.engine.runtime;
+package org.apache.sling.scripting.sightly.impl.utils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -33,21 +33,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.script.Bindings;
 import org.apache.commons.lang.StringUtils;
 import org.apache.sling.api.adapter.Adaptable;
-import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.scripting.sightly.Record;
 import org.apache.sling.scripting.sightly.SightlyException;
-import org.apache.sling.scripting.sightly.extension.RuntimeExtension;
-import org.apache.sling.scripting.sightly.render.RenderContext;
 
-/**
- * Rendering context for Sightly rendering units.
- * @see RenderUnit
- */
-public class RenderContextImpl implements RenderContext {
+public class RenderUtils {
 
 public static final String TO_STRING_METHOD = "toString";
 public static final String PROPERTY_ACCESS = "resolveProperty";
@@ -56,51 +48,28 @@ public class RenderContextImpl implement
 public static final String STRING_COERCE = "toString";
 public static final String BOOLEAN_COERCE = "toBoolean";
 
-private final Bindings bindings;
-private final Map mapping;
-private final ResourceResolver scriptResourceResolver;
-
-public RenderContextImpl(Bindings bindings, Map 
mapping, ResourceResolver scriptResourceResolver) {
-this.bindings = bindings;
-this.mapping = mapping;
-this.scriptResourceResolver = scriptResourceResolver;
-}
-
-@Override
-public ResourceResolver getScriptResourceResolver() {
-return scriptResourceResolver;
-}
-
 /**
- * Provide the bindings for this script
- * @return - the list of global bindings available to the script
+ * Checks if an object is a {@link Collection} or is backed by one.
+ * @param target the target object
+ * @return {@code true} if the {@code target} is a collection or is backed 
by one, {@code false} otherwise
  */
-@Override
-public Bindings getBindings() {
-return bindings;
-}
-
-@Override
-public Object call(String functionName, Object... arguments) {
-RuntimeExtension extension = mapping.get(functionName);
-if (extension == null) {
-throw new SightlyException("Runtime extension is not available: " 
+ functionName);
-}
-return extension.call(this, arguments);
+public static boolean isCollection(Object target) {
+return (target instanceof Collection) || (target instanceof Object[])
+|| (target instanceof Iterable)
+|| (target instanceof Iterator);
 }
 
 /**
- * Retrieve the specified property from the given object
+ * Coerce the object to a numeric value
  *
- * @param target   - the target object
- * @param property - the property name
- * @return - the value of the property or null if the object has no such 
property
+ * @param object - the target object
+ * @return - the numeric representation
  */
-public Object resolveProperty(Object target, Object property) {
-if (property instanceof Number) {
-return getIndex(target, ((Number) property).intValue());
+public static Number toNumber(Object object) {
+if (object instanceof Number) {
+return (Number) object;
 }
-return getProperty(target, property);
+return 0;
 }
 
 /**
@@ -109,7 +78,7 @@ public class RenderContextImpl implement
   

Jenkins build is still unstable: sling-contrib-1.7 #322

2015-09-03 Thread Apache Jenkins Server
See 



svn commit: r1701042 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml

2015-09-03 Thread olli
Author: olli
Date: Thu Sep  3 14:59:52 2015
New Revision: 1701042

URL: http://svn.apache.org/r1701042
Log:
SLING-4995 Upgrade to Oak 1.3.4

Modified:

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml

Modified: 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1701042=1701041=1701042=diff
==
--- 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
 (original)
+++ 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
 Thu Sep  3 14:59:52 2015
@@ -386,10 +386,10 @@
   
   
   
-mvn:org.apache.jackrabbit/oak-core/1.3.3
-mvn:org.apache.jackrabbit/oak-commons/1.3.3
-mvn:org.apache.jackrabbit/oak-lucene/1.3.3
-mvn:org.apache.jackrabbit/oak-blob/1.3.3
+mvn:org.apache.jackrabbit/oak-core/1.3.4
+mvn:org.apache.jackrabbit/oak-commons/1.3.4
+mvn:org.apache.jackrabbit/oak-lucene/1.3.4
+mvn:org.apache.jackrabbit/oak-blob/1.3.4
 
 scr
 jackrabbit-sling




svn commit: r964197 - /websites/production/sling/content/

2015-09-03 Thread kwin
Author: kwin
Date: Thu Sep  3 15:15:34 2015
New Revision: 964197

Log:
Publishing svnmucc operation to sling site by kwin

Added:
websites/production/sling/content/
  - copied from r964196, websites/staging/sling/trunk/content/



Jenkins build is back to stable : sling-trunk-1.8 #1471

2015-09-03 Thread Apache Jenkins Server
See 



svn commit: r1701047 [1/2] - in /sling/trunk/bundles/scripting/sightly/engine/src: main/java/org/apache/sling/scripting/sightly/impl/compiled/ main/java/org/apache/sling/scripting/sightly/impl/compile

2015-09-03 Thread radu
Author: radu
Date: Thu Sep  3 15:13:39 2015
New Revision: 1701047

URL: http://svn.apache.org/r1701047
Log:
SLING-4957 - Sightly RenderContextImpl contains utility methods that don't 
belong there

* moved utility methods from RenderContextImpl to RenderUtils
* made methods static
* removed unnecessary passing of renderContext just for utility methods
(patch provided by Vlad Băilescu)

Added:

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/utils/RenderUtils.java
  - copied, changed from r1701042, 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderContextImpl.java

sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/utils/RenderUtilsTest.java
  - copied, changed from r1701042, 
sling/trunk/bundles/scripting/sightly/engine/src/main/resources/templates/compiled_unit_template.txt
Modified:

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/ExpressionTranslator.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/GenHelper.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/SourceGenConstants.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyCompilerService.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/BinaryOperator.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/UnaryOperator.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/DeadCodeRemoval.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/reduce/ConstantFolding.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/reduce/ExpressionReducer.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/visitor/CodeGenVisitor.java

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

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

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

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

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

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderContextImpl.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderUnit.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/URIManipulationFilter.java

sling/trunk/bundles/scripting/sightly/engine/src/main/resources/templates/compiled_unit_template.txt

sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderContextImplTest.java

Modified: 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/ExpressionTranslator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/ExpressionTranslator.java?rev=1701047=1701046=1701047=diff
==
--- 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/ExpressionTranslator.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/ExpressionTranslator.java
 Thu Sep  3 15:13:39 2015
@@ -38,7 +38,7 @@ import org.apache.sling.scripting.sightl
 import 
org.apache.sling.scripting.sightly.impl.compiler.expression.node.UnaryOperation;
 import 

svn commit: r964196 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html

2015-09-03 Thread buildbot
Author: buildbot
Date: Thu Sep  3 15:13:50 2015
New Revision: 964196

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)

websites/staging/sling/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Sep  3 15:13:50 2015
@@ -1 +1 @@
-1700419
+1701046

Modified: 
websites/staging/sling/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
==
--- 
websites/staging/sling/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
 Thu Sep  3 15:13:50 2015
@@ -39,7 +39,18 @@
 
 
  
-  Documentation 
+  
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }
+Documentation 
 Getting Started 
 The Sling Engine 
 Development 
@@ -90,7 +101,18 @@
   
   
   Manipulating Content - The SlingPostServlet (servlets.post)
-  
+  
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }
+
 
 Multiple Ways to Modify 
Content
 Quickstart: Creating 
Content
@@ -167,10 +189,10 @@
 
 
 
-Multiple Ways to Modify Content
+Multiple Ways to Modify Content
 As always in life there is more than one way to do it. So to modify content 
in a JCR repository underlying Sling, you have multiple options, two of which 
are WebDAV and the Sling default POST Servlet also called the 
SlingPostServlet. This page is about how you can modify - create, 
modify, copy, move, delete, import - content through the 
SlingPostServlet. In addition it also explains how to extend the 
SlingPostServlet with new operations.
 What is Content anyway? In the following discussion, I use the terms 
Content and Item interchangeably. With Content I 
just mean some data to be stored in the JCR repository to be later used as the 
basis for some presentation. In this sense Content is a rather 
conceptual term. Item is the name of the parent interface of the JCR 
Node and Property interfaces. When speaking of Items 
we mean some actual data stored in the repository ignoring whether the data is 
actually stored as a Node with child nodes and properties or just a 
single Property.
-Quickstart: Creating Content
+Quickstart: Creating Content
 To create content you simply send an HTTP POST request using the path of 
the node to store the content in and include the actual content as request 
parameters. So one possibility to do just that is by having an HTML Form like 
the following:
 form method=POST action=http://host/some/new/content; enctype=multipart/form-data
input type=text name=title value= /
@@ -197,11 +219,11 @@
 
 
 
-Preface: multipart/form-data 
POSTs
+Preface: multipart/form-data POSTs
 Sometimes you might want to have the content modifications applied in a 
certain order. This is particularly interesting if you use fields to create 
child nodes and if you want to stipulate a certain child node order based on 
the form fields.
 In this case, ensure you are submitting the POST request using 
multipart/form-data encoding. This preserves the order of 
parameter application according to the original HTML form. To this avail, 
ensure to always include the enctype="multipart/form-data" 
attribute with the form tag.
 This support requires Sling Engine 2.1.0 and the Sling Default Post Servlet 
2.0.6.
-SlingPostServlet Operations
+SlingPostServlet Operations
 The SlingPostServlet is actually just a front-end to the actual operations. 
To select the actual operation to execute, the :operation request 
parameter 

svn commit: r1701046 - /sling/site/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.mdtext

2015-09-03 Thread kwin
Author: kwin
Date: Thu Sep  3 15:13:35 2015
New Revision: 1701046

URL: http://svn.apache.org/r1701046
Log:
SLING-4347 clarify that timezone offsets are only kept when using ISO8601

Modified:

sling/site/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.mdtext

Modified: 
sling/site/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.mdtext?rev=1701046=1701045=1701046=diff
==
--- 
sling/site/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.mdtext
 Thu Sep  3 15:13:35 2015
@@ -201,6 +201,7 @@ Assuming the user selected a file named
 Parameters providing date/time values to be stored in JCR properties of type 
*Date* require special handling. The problem is that there are a number of 
formats to represent such date/time values. To account for this open-ended list 
of formats, the Sling Post Servlet supports configurability of the process of 
parsing strings into `Calendar` objects.
 
 The Sling Post Servlet configuration property `servlet.post.dateFormats` takes 
a list of format strings which are used to setup `java.text.SimpleDateFormat` 
instances for parsing date/time string representations. A special format string 
`ISO8601` is supported to indicate the string to be parsed as a JCR standard 
string representation of a _Date_ property.
+Only the latter supports storing the actual timezone offset. All the parsers 
leveraging `java.text.SimpleDateFormat` loose the given timezone and convert 
that just to the default timezone of the JRE (when creating the `Calendar` out 
of the `Date`, because `java.lang.Date` is not carrying any timezone 
information).
 
 The default list of configured date/time parse pattern is:
 




Jenkins build is still unstable: sling-contrib-1.7 #323

2015-09-03 Thread Apache Jenkins Server
See 



Jenkins build is still unstable: sling-contrib-1.7 #324

2015-09-03 Thread Apache Jenkins Server
See 



Jenkins build became unstable: sling-trunk-1.8 #1472

2015-09-03 Thread Apache Jenkins Server
See 



Jenkins build is back to stable : sling-trunk-1.8 #1473

2015-09-03 Thread Apache Jenkins Server
See 



Build failed in Jenkins: sling-trunk-1.7 #2179

2015-09-03 Thread Apache Jenkins Server
See 

Changes:

[radu] SLING-4957 - Sightly RenderContextImpl contains utility methods that 
don't belong there

* moved utility methods from RenderContextImpl to RenderUtils
* made methods static
* removed unnecessary passing of renderContext just for utility methods
(patch provided by Vlad Băilescu)

[olli] SLING-4995 Upgrade to Oak 1.3.4

--
[...truncated 97391 lines...]
[INFO] Apache Sling Filesystem Resource Provider . SUCCESS [9.103s]
[INFO] Apache Sling javax.activation bundle .. SUCCESS [8.984s]
[INFO] Apache Sling Service User Mapper .. SUCCESS [9.201s]
[INFO] Apache Sling Settings . SUCCESS [10.132s]
[INFO] Apache Sling Web Console Branding . SUCCESS [8.597s]
[INFO] Apache Sling Web Console Security Provider  SUCCESS [5.481s]
[INFO] Apache Sling Explorer . SUCCESS [8.936s]
[INFO] Apache Sling Health Check Core  SUCCESS [10.805s]
[INFO] Apache Sling Health Check Annotations . SUCCESS [9.278s]
[INFO] Apache Sling Health Check Samples . SUCCESS [8.422s]
[INFO] Apache Sling Health Check Support Components .. SUCCESS [10.511s]
[INFO] Apache Sling Health Check Webconsole Plugin ... SUCCESS [4.242s]
[INFO] Apache Sling Health Check JUnit Bridge  SUCCESS [6.007s]
[INFO] Apache Sling Health Check Integration Tests ... SUCCESS [36.697s]
[INFO] Apache Sling Health Check Reactor POM . SUCCESS [3.721s]
[INFO] Apache Sling Resource Access Security . SUCCESS [5.640s]
[INFO] Apache Sling Test Tools ... SUCCESS [5.203s]
[INFO] Apache Sling Resource Access Security Integration Tests  SUCCESS 
[1:14.177s]
[INFO] Apache Sling Validation Framework API . SUCCESS [7.753s]
[INFO] Apache Sling Validation Framework Core Implementation  SUCCESS [14.306s]
[INFO] Apache Sling Validation Framework Testing Services  SUCCESS [14.083s]
[INFO] Apache Sling Validation Framework Integration Tests  SUCCESS [38.805s]
[INFO] Apache Sling Validation Framework Examples  SUCCESS [4.596s]
[INFO] Apache Sling Validation Framework Builder . SUCCESS [3.203s]
[INFO] Apache Sling Models API ... SUCCESS [5.427s]
[INFO] Apache Sling Models Implementation  SUCCESS [9.756s]
[INFO] Apache Sling Models Validation Implementation . SUCCESS [3.809s]
[INFO] Apache Sling Models Integration Tests . FAILURE [1:05.421s]
[INFO] Apache Sling Internationalization Support . SKIPPED
[INFO] Apache Sling XSS Protection Bundle  SKIPPED
[INFO] Apache Sling JUnit Core ... SKIPPED
[INFO] Apache Sling JUnit Scriptable Tests Provider .. SKIPPED
[INFO] Apache Sling JUnit Health Checks .. SKIPPED
[INFO] Apache Sling JUnit Remote Tests Runners ... SKIPPED
[INFO] Apache Sling JUnit Performance  SKIPPED
[INFO] Apache Sling Testing Mock Log Configuration ... SKIPPED
[INFO] Apache Sling Testing Resource Resolver Mock ... SKIPPED
[INFO] Apache Sling Testing JCR Mock . SKIPPED
[INFO] Apache Sling Testing OSGi Mock  SKIPPED
[INFO] Apache Sling Testing Sling Mock ... SKIPPED
[INFO] Apache Sling Testing Sling Mock Jackrabbit-based Resource Resolver  
SKIPPED
[INFO] Apache Sling Sample Server-Side Tests . SKIPPED
[INFO] Apache Sling Failing Server-Side Tests  SKIPPED
[INFO] Apache Sling Sample Integration Tests . SKIPPED
[INFO] Apache Sling Testing Modules Reactor .. SKIPPED
[INFO] Apache Sling Installer  SKIPPED
[INFO] Apache Sling Installer WebConsole Plugin .. SKIPPED
[INFO] Apache Sling File Installer ... SKIPPED
[INFO] Apache Sling JCR Installer  SKIPPED
[INFO] Apache Sling Installer Configuration Admin Support  SKIPPED
[INFO] Apache Sling Deployment Package Installer . SKIPPED
[INFO] Apache Sling Subsystems Installer . SKIPPED
[INFO] Apache Sling Installer Integration Tests .. SKIPPED
[INFO] Apache Sling Launchpad API  SKIPPED
[INFO] Apache Sling Launchpad Installer .. SKIPPED
[INFO] Apache Sling Launchpad Content  SKIPPED
[INFO] Apache Sling Launchpad Testing Services ... SKIPPED
[INFO] Apache Sling Launchpad Testing Services WAR ... SKIPPED
[INFO] Apache Sling Launchpad Testing Fragment Bundle  SKIPPED
[INFO] Apache Sling Launchpad Test Bundles ... SKIPPED
[INFO] Apache Sling Integration Tests  SKIPPED
[INFO] Apache Sling Launchpad Testing  SKIPPED
[INFO] Apache Sling (Builder)  SKIPPED
[INFO] 

Jenkins build is back to normal : sling-trunk-1.7 #2180

2015-09-03 Thread Apache Jenkins Server
See 



svn commit: r1700936 - in /sling/trunk/testing/mocks/sling-mock/src: main/java/org/apache/sling/testing/mock/sling/servlet/ test/java/org/apache/sling/testing/mock/sling/servlet/

2015-09-03 Thread sseifert
Author: sseifert
Date: Thu Sep  3 06:17:31 2015
New Revision: 1700936

URL: http://svn.apache.org/r1700936
Log:
SLING-4990 Support HttpSession invalidate, new, lastAccessedTime, 
maxInteractiveInterval

Modified:

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java

sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSessionTest.java

Modified: 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java?rev=1700936=1700935=1700936=diff
==
--- 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java
 (original)
+++ 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java
 Thu Sep  3 06:17:31 2015
@@ -37,6 +37,9 @@ public final class MockHttpSession imple
 private final Map attributeMap = new HashMap();
 private final String sessionID = UUID.randomUUID().toString();
 private final long creationTime = System.currentTimeMillis();
+private boolean invalidated = false;
+private boolean isNew = true;
+private int maxActiveInterval = 1800;
 
 @Override
 public ServletContext getServletContext() {
@@ -45,12 +48,14 @@ public final class MockHttpSession imple
 
 @Override
 public Object getAttribute(final String name) {
+checkInvalidatedState();
 return this.attributeMap.get(name);
 }
 
 @SuppressWarnings("unchecked")
 @Override
 public Enumeration getAttributeNames() {
+checkInvalidatedState();
 return 
IteratorUtils.asEnumeration(this.attributeMap.keySet().iterator());
 }
 
@@ -61,68 +66,92 @@ public final class MockHttpSession imple
 
 @Override
 public long getCreationTime() {
+checkInvalidatedState();
 return this.creationTime;
 }
 
 @Override
 public Object getValue(final String name) {
+checkInvalidatedState();
 return getAttribute(name);
 }
 
 @Override
 public String[] getValueNames() {
+checkInvalidatedState();
 return this.attributeMap.keySet().toArray(new 
String[this.attributeMap.keySet().size()]);
 }
 
 @Override
 public void putValue(final String name, final Object value) {
+checkInvalidatedState();
 setAttribute(name, value);
 }
 
 @Override
 public void removeAttribute(final String name) {
+checkInvalidatedState();
 this.attributeMap.remove(name);
 }
 
 @Override
 public void removeValue(final String name) {
+checkInvalidatedState();
 this.attributeMap.remove(name);
 }
 
 @Override
 public void setAttribute(final String name, final Object value) {
+checkInvalidatedState();
 this.attributeMap.put(name, value);
 }
 
-// --- unsupported operations ---
 @Override
-public long getLastAccessedTime() {
-throw new UnsupportedOperationException();
+public void invalidate() {
+checkInvalidatedState();
+this.invalidated = true;
+}
+
+private void checkInvalidatedState() {
+if (invalidated) {
+throw new IllegalStateException("Session is already invalidated.");
+}
+}
+
+public boolean isInvalidated() {
+return invalidated;
 }
 
 @Override
-public int getMaxInactiveInterval() {
-throw new UnsupportedOperationException();
+public boolean isNew() {
+checkInvalidatedState();
+return isNew;
+}
+
+public void setNew(boolean isNew) {
+this.isNew = isNew;
 }
 
 @Override
-@SuppressWarnings("deprecation")
-public javax.servlet.http.HttpSessionContext getSessionContext() {
-throw new UnsupportedOperationException();
+public long getLastAccessedTime() {
+checkInvalidatedState();
+return creationTime;
 }
 
 @Override
-public void invalidate() {
-throw new UnsupportedOperationException();
+public int getMaxInactiveInterval() {
+return maxActiveInterval;
 }
 
 @Override
-public boolean isNew() {
-throw new UnsupportedOperationException();
+public void setMaxInactiveInterval(final int interval) {
+this.maxActiveInterval = interval;
 }
 
+// --- unsupported operations ---
 @Override
-public void setMaxInactiveInterval(final int interval) {
+@SuppressWarnings("deprecation")
+public 

Jenkins build is still unstable: sling-trunk-1.7 #2173

2015-09-03 Thread Apache Jenkins Server
See 



svn commit: r1700965 - in /sling/trunk/testing/mocks/sling-mock/src: main/java/org/apache/sling/testing/mock/sling/servlet/ test/java/org/apache/sling/testing/mock/sling/servlet/

2015-09-03 Thread sseifert
Author: sseifert
Date: Thu Sep  3 09:20:32 2015
New Revision: 1700965

URL: http://svn.apache.org/r1700965
Log:
SLING-4994 Support InputStream, ContentLenght, ContentType and 
CharacterEncoding in Request

Modified:

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java

sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java

Modified: 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java?rev=1700965=1700964=1700965=diff
==
--- 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
 (original)
+++ 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
 Thu Sep  3 09:20:32 2015
@@ -18,7 +18,12 @@
  */
 package org.apache.sling.testing.mock.sling.servlet;
 
+import static 
org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse.CHARSET_SEPARATOR;
+
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -88,6 +93,9 @@ public class MockSlingHttpServletRequest
 private String method = HttpConstants.METHOD_GET;
 private final HeaderSupport headerSupport = new HeaderSupport();
 private final CookieSupport cookieSupport = new CookieSupport();
+private String contentType;
+private String characterEncoding;
+private byte[] content;
 
 private static final ResourceBundle EMPTY_RESOURCE_BUNDLE = new 
ListResourceBundle() {
 @Override
@@ -506,6 +514,60 @@ public class MockSlingHttpServletRequest
 return params;
 }
 
+@Override
+public String getCharacterEncoding() {
+return this.characterEncoding;
+}
+
+@Override
+public void setCharacterEncoding(String charset) {
+this.characterEncoding = charset;
+}
+
+@Override
+public String getContentType() {
+if (this.contentType == null) {
+return null;
+} else {
+return this.contentType
++ (StringUtils.isNotBlank(characterEncoding) ? 
CHARSET_SEPARATOR + characterEncoding : "");
+}
+}
+
+public void setContentType(String type) {
+this.contentType = type;
+if (StringUtils.contains(this.contentType, CHARSET_SEPARATOR)) {
+this.characterEncoding = 
StringUtils.substringAfter(this.contentType, CHARSET_SEPARATOR);
+this.contentType = StringUtils.substringBefore(this.contentType, 
CHARSET_SEPARATOR);
+}
+}
+
+@Override
+public ServletInputStream getInputStream() {
+if (content == null) {
+return null;
+}
+return new ServletInputStream() {
+private final InputStream is = new ByteArrayInputStream(content);
+@Override
+public int read() throws IOException {
+return is.read();
+}
+};  
+}
+
+@Override
+public int getContentLength() {
+if (content == null) {
+return 0;
+}
+return content.length;
+}
+
+public void setContent(byte[] content) {
+this.content = content;
+}
+
 
 // --- unsupported operations ---
 
@@ -610,26 +672,6 @@ public class MockSlingHttpServletRequest
 }
 
 @Override
-public String getCharacterEncoding() {
-throw new UnsupportedOperationException();
-}
-
-@Override
-public int getContentLength() {
-throw new UnsupportedOperationException();
-}
-
-@Override
-public String getContentType() {
-throw new UnsupportedOperationException();
-}
-
-@Override
-public ServletInputStream getInputStream() {
-throw new UnsupportedOperationException();
-}
-
-@Override
 public String getLocalAddr() {
 throw new UnsupportedOperationException();
 }
@@ -684,11 +726,6 @@ public class MockSlingHttpServletRequest
 throw new UnsupportedOperationException();
 }
 
-@Override
-public void setCharacterEncoding(String env) {
-throw new UnsupportedOperationException();
-}
-
 @Override
 public boolean authenticate(HttpServletResponse response) {
 throw new UnsupportedOperationException();

Modified: 

Jenkins build is still unstable: sling-trunk-1.8 #1466

2015-09-03 Thread Apache Jenkins Server
See 



Jenkins build is still unstable: sling-trunk-1.8 #1465

2015-09-03 Thread Apache Jenkins Server
See 



svn commit: r1700953 - in /sling/trunk/testing/mocks/sling-mock/src: main/java/org/apache/sling/testing/mock/sling/servlet/ test/java/org/apache/sling/testing/mock/sling/servlet/

2015-09-03 Thread sseifert
Author: sseifert
Date: Thu Sep  3 08:36:21 2015
New Revision: 1700953

URL: http://svn.apache.org/r1700953
Log:
SLING-4993 Support RequestParameter in MockSlingHttpServlerRequest

Added:

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestParameter.java
   (with props)

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestParameterMap.java
   (with props)
Modified:

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java

sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java

Added: 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestParameter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestParameter.java?rev=1700953=auto
==
--- 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestParameter.java
 (added)
+++ 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestParameter.java
 Thu Sep  3 08:36:21 2015
@@ -0,0 +1,105 @@
+/*
+ * 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.testing.mock.sling.servlet;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+import org.apache.sling.api.request.RequestParameter;
+
+/**
+ * Mock implementation of {@link RequestParameter}.
+ */
+class MockRequestParameter implements RequestParameter {
+
+private String name;
+private String encoding = "UTF-8";
+private String value;
+
+private byte[] content;
+
+public MockRequestParameter(String name, String value) {
+this.value = value;
+this.content = null;
+}
+void setName(String name) {
+this.name = name;
+}
+
+public String getName() {
+return this.name;
+}
+
+public void setEncoding(String encoding) {
+this.encoding = encoding;
+}
+
+public String getEncoding() {
+return this.encoding;
+}
+
+public byte[] get() {
+if (content == null) {
+try {
+content = getString().getBytes(getEncoding());
+} catch (Exception e) {
+// UnsupportedEncodingException, IllegalArgumentException
+content = getString().getBytes();
+}
+}
+return content;
+}
+
+public String getContentType() {
+// none known for www-form-encoded parameters
+return null;
+}
+
+public InputStream getInputStream() {
+return new ByteArrayInputStream(this.get());
+}
+
+public String getFileName() {
+// no original file name
+return null;
+}
+
+public long getSize() {
+return this.get().length;
+}
+
+public String getString() {
+return value;
+}
+
+public String getString(String encoding) throws 
UnsupportedEncodingException {
+return new String(this.get(), encoding);
+}
+
+public boolean isFormField() {
+// www-form-encoded are always form fields
+return true;
+}
+
+public String toString() {
+return this.getString();
+}
+
+}

Propchange: 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestParameter.java
--
svn:eol-style = native

Propchange: 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestParameter.java
--
--- svn:keywords (added)
+++ svn:keywords Thu Sep  3 08:36:21 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author

Propchange: 

Jenkins build is still unstable: sling-trunk-1.8 #1467

2015-09-03 Thread Apache Jenkins Server
See 



svn commit: r1700973 - in /sling/trunk: bundles/scripting/sightly/testing/src/main/provisioning/model.txt launchpad/builder/src/main/provisioning/sling.txt

2015-09-03 Thread radu
Author: radu
Date: Thu Sep  3 09:53:46 2015
New Revision: 1700973

URL: http://svn.apache.org/r1700973
Log:
SLING-4992 - 3 Sightly integration tests fail

* updated snapshot dependencies post-release

Modified:

sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

Modified: 
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1700973=1700972=1700973=diff
==
--- 
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt 
(original)
+++ 
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt 
Thu Sep  3 09:53:46 2015
@@ -20,7 +20,8 @@
 # Dependencies
 [artifacts]
   org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart
-  
org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.9-SNAPSHOT
+  org.apache.sling/org.apache.sling.scripting.sightly/1.0.5-SNAPSHOT
+  
org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.11-SNAPSHOT
   org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT
   
org.apache.sling/org.apache.sling.scripting.sightly.testing-content/1.0.5-SNAPSHOT
 

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1700973=1700972=1700973=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Thu Sep  3 
09:53:46 2015
@@ -61,8 +61,8 @@
 org.apache.sling/org.apache.sling.scripting.javascript/2.0.23-SNAPSHOT
 org.apache.sling/org.apache.sling.scripting.jsp/2.1.7-SNAPSHOT
 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.5-SNAPSHOT
-org.apache.sling/org.apache.sling.scripting.sightly/1.0.3-SNAPSHOT
-
org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.9-SNAPSHOT
+org.apache.sling/org.apache.sling.scripting.sightly/1.0.5-SNAPSHOT
+
org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.11-SNAPSHOT
 org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT
 org.apache.sling/org.apache.sling.serviceusermapper/1.2.0
 org.apache.sling/org.apache.sling.servlets.get/2.1.12




Jenkins build is still unstable: sling-trunk-1.8 #1468

2015-09-03 Thread Apache Jenkins Server
See 



Jenkins build is back to stable : sling-trunk-1.7 #2175

2015-09-03 Thread Apache Jenkins Server
See 



svn commit: r1700999 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

2015-09-03 Thread radu
Author: radu
Date: Thu Sep  3 11:50:41 2015
New Revision: 1700999

URL: http://svn.apache.org/r1700999
Log:
releng: updated dependencies post-release

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1700999=1700998=1700999=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Thu Sep  3 
11:50:41 2015
@@ -58,7 +58,7 @@
 org.apache.sling/org.apache.sling.resourceresolver/1.2.6
 org.apache.sling/org.apache.sling.scripting.api/2.1.8
 org.apache.sling/org.apache.sling.scripting.core/2.0.34
-org.apache.sling/org.apache.sling.scripting.javascript/2.0.23-SNAPSHOT
+org.apache.sling/org.apache.sling.scripting.javascript/2.0.25-SNAPSHOT
 org.apache.sling/org.apache.sling.scripting.jsp/2.1.7-SNAPSHOT
 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.5-SNAPSHOT
 org.apache.sling/org.apache.sling.scripting.sightly/1.0.5-SNAPSHOT




svn commit: r1700997 - /sling/tags/org.apache.sling.scripting.javascript-2.0.24/

2015-09-03 Thread radu
Author: radu
Date: Thu Sep  3 11:43:22 2015
New Revision: 1700997

URL: http://svn.apache.org/r1700997
Log:
[maven-release-plugin] copy for tag org.apache.sling.scripting.javascript-2.0.24

Added:
sling/tags/org.apache.sling.scripting.javascript-2.0.24/
  - copied from r1700996, sling/trunk/bundles/scripting/javascript/



svn commit: r1700996 - /sling/trunk/bundles/scripting/javascript/pom.xml

2015-09-03 Thread radu
Author: radu
Date: Thu Sep  3 11:43:08 2015
New Revision: 1700996

URL: http://svn.apache.org/r1700996
Log:
[maven-release-plugin] prepare release 
org.apache.sling.scripting.javascript-2.0.24

Modified:
sling/trunk/bundles/scripting/javascript/pom.xml

Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1700996=1700995=1700996=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Sep  3 11:43:08 2015
@@ -29,16 +29,16 @@
 
 
 org.apache.sling.scripting.javascript
-2.0.23-SNAPSHOT
+2.0.24
 bundle
 
 Apache Sling Scripting JavaScript Support
 Support for JavaScript scripting
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript
-
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.24
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.24
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.24
 
 
 




svn commit: r1700998 - /sling/trunk/bundles/scripting/javascript/pom.xml

2015-09-03 Thread radu
Author: radu
Date: Thu Sep  3 11:43:24 2015
New Revision: 1700998

URL: http://svn.apache.org/r1700998
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/scripting/javascript/pom.xml

Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1700998=1700997=1700998=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Sep  3 11:43:24 2015
@@ -29,16 +29,16 @@
 
 
 org.apache.sling.scripting.javascript
-2.0.24
+2.0.25-SNAPSHOT
 bundle
 
 Apache Sling Scripting JavaScript Support
 Support for JavaScript scripting
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.24
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.24
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.24
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript
+
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript
 
 
 




Nexus: Staging Completed

2015-09-03 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDescription:Apache Sling Scripting _javascript_ 2.0.24Deployer properties:"userAgent" = "Apache-Maven/3.3.3 (Java 1.8.0_51; Mac OS X 10.11)""userId" = "radu""ip" = "192.147.117.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24-source-release.zip.asc(SHA1: 2e60137577eb91be3062a9b55c66355f25a06db5)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24-source-release.zip(SHA1: e69a26744800fd08ff2cc277b548cbad088a7b58)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24.jar(SHA1: 247935fd9481c6e390f853bf6eb35ed19002e41d)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24.pom(SHA1: 3aee0f0d87a407b8ed8726f07836b26903f6febd)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24-javadoc.jar.asc(SHA1: c8221c5c93ca490abed6981d7fa3ded89d10134d)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24.pom.asc(SHA1: deb19ca5d12811506604ad3bf6fd45df0522bc9c)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24-sources.jar(SHA1: 313f25eb619942995fbd03bcd8f6977ffa14189f)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24-sources.jar.asc(SHA1: 92cd344bba2bbad1f789ac287fd21448f6d2095e)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24-javadoc.jar(SHA1: 3f07a01542953c0765aef607bfeb963e66dd4f27)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.24/org.apache.sling.scripting._javascript_-2.0.24.jar.asc(SHA1: 4e0706059b12f4b4b25801675114f8f4b9b431bb)Action performed by Radu Cotescu (radu)

Jenkins build is back to stable : sling-trunk-1.8 #1469

2015-09-03 Thread Apache Jenkins Server
See 



Jenkins build is still unstable: sling-contrib-1.7 #320

2015-09-03 Thread Apache Jenkins Server
See 



svn commit: r1701144 - in /sling/trunk/testing/mocks: osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java sling-mock/src/main/java/org/apache/sling/testing/mock/sling/jun

2015-09-03 Thread sseifert
Author: sseifert
Date: Thu Sep  3 22:45:43 2015
New Revision: 1701144

URL: http://svn.apache.org/r1701144
Log:
cosmetic: beautify error messages when setup/teardown fails

Modified:

sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java

Modified: 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java?rev=1701144=1701143=1701144=diff
==
--- 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
 (original)
+++ 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
 Thu Sep  3 22:45:43 2015
@@ -90,7 +90,7 @@ public final class OsgiContext extends O
 try {
 this.setUpCallback.execute(this);
 } catch (Throwable ex) {
-throw new RuntimeException("Executing setup callback failed.", 
ex);
+throw new RuntimeException("Setup failed: " + ex.getMessage(), 
ex);
 }
 }
 }
@@ -100,7 +100,7 @@ public final class OsgiContext extends O
 try {
 this.tearDownCallback.execute(this);
 } catch (Throwable ex) {
-throw new RuntimeException("Executing setup callback failed.", 
ex);
+throw new RuntimeException("Teardown failed: " + 
ex.getMessage(), ex);
 }
 }
 }

Modified: 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java?rev=1701144=1701143=1701144=diff
==
--- 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java
 (original)
+++ 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java
 Thu Sep  3 22:45:43 2015
@@ -132,7 +132,7 @@ public final class SlingContext extends
 try {
 this.setUpCallback.execute(this);
 } catch (Throwable ex) {
-throw new RuntimeException("Executing setup callback failed.", 
ex);
+throw new RuntimeException("Setup failed: " + ex.getMessage(), 
ex);
 }
 }
 }
@@ -142,7 +142,7 @@ public final class SlingContext extends
 try {
 this.tearDownCallback.execute(this);
 } catch (Throwable ex) {
-throw new RuntimeException("Executing setup callback failed.", 
ex);
+throw new RuntimeException("Teardown failed: " + 
ex.getMessage(), ex);
 }
 }
 }




Build failed in Jenkins: sling-contrib-1.7 #325

2015-09-03 Thread Apache Jenkins Server
See 

--
[...truncated 11852 lines...]
at 
org.apache.felix.http.base.internal.handler.FilterHandler.handle(FilterHandler.java:135)
at 
org.apache.felix.http.base.internal.dispatch.InvocationChain.doFilter(InvocationChain.java:74)
at 
org.apache.felix.http.sslfilter.internal.SslFilter.doFilter(SslFilter.java:89)
at 
org.apache.felix.http.base.internal.handler.FilterHandler.handle(FilterHandler.java:135)
at 
org.apache.felix.http.base.internal.dispatch.InvocationChain.doFilter(InvocationChain.java:74)
at 
org.apache.sling.engine.impl.log.RequestLoggerFilter.doFilter(RequestLoggerFilter.java:75)
at 
org.apache.felix.http.base.internal.handler.FilterHandler.handle(FilterHandler.java:135)
at 
org.apache.felix.http.base.internal.dispatch.InvocationChain.doFilter(InvocationChain.java:74)
at 
org.apache.felix.http.base.internal.dispatch.Dispatcher.dispatch(Dispatcher.java:124)
at 
org.apache.felix.http.base.internal.DispatcherServlet.service(DispatcherServlet.java:61)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:725)
at 
org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:808)
at 
org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:587)
at 
org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:221)
at 
org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1127)
at 
org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:515)
at 
org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:185)
at 
org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1061)
at 
org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:141)
at 
org.eclipse.jetty.server.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:215)
at 
org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:97)
at org.eclipse.jetty.server.Server.handle(Server.java:499)
at org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:310)
at 
org.eclipse.jetty.server.HttpConnection.onFillable(HttpConnection.java:257)
at 
org.eclipse.jetty.io.AbstractConnection$2.run(AbstractConnection.java:540)
at 
org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:635)
at 
org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:555)
at java.lang.Thread.run(Thread.java:724)

Request Progress:

  0 TIMER_START{Request Processing}
  0 COMMENT timer_end format is {elapsed msec,timer name} 
optional message
  0 LOG Method=GET, 
PathInfo=/JSONGroovyBuilderTest/1441320379332/this_is_a_test_14413.json
  0 TIMER_START{ResourceResolution}
  0 TIMER_END{0,ResourceResolution} 
URI=/JSONGroovyBuilderTest/1441320379332/this_is_a_test_14413.json resolves to 
Resource=JcrNodeResource, type=integration-test/srt.1441320379332, 
superType=null, path=/JSONGroovyBuilderTest/1441320379332/this_is_a_test_14413
  0 LOG Resource Path Info: SlingRequestPathInfo: 
path=/JSONGroovyBuilderTest/1441320379332/this_is_a_test_14413, 
selectorString=null, extension=json, 
suffix=null
  0 TIMER_START{ServletResolution}
  0 TIMER_START{resolveServlet(JcrNodeResource, 
type=integration-test/srt.1441320379332, superType=null, 
path=/JSONGroovyBuilderTest/1441320379332/this_is_a_test_14413)}
  3 TIMER_END{3,resolveServlet(JcrNodeResource, 
type=integration-test/srt.1441320379332, superType=null, 
path=/JSONGroovyBuilderTest/1441320379332/this_is_a_test_14413)} Using servlet 
/apps/integration-test/srt.1441320379332/json.groovy
  3 TIMER_END{3,ServletResolution} 
URI=/JSONGroovyBuilderTest/1441320379332/this_is_a_test_14413.json handled by 
Servlet=/apps/integration-test/srt.1441320379332/json.groovy
  3 LOG Applying Requestfilters
  3 LOG Calling filter: 
org.apache.sling.engine.impl.debug.RequestProgressTrackerLogFilter
  3 LOG Calling filter: 
org.apache.sling.launchpad.testservices.filters.SlingFilter
  3 LOG Calling filter: 
org.apache.sling.launchpad.testservices.filters.NoPropertyFilter
  3 LOG Calling filter: org.apache.sling.i18n.impl.I18NFilter
  3 LOG Applying Componentfilters
  3 TIMER_START{/apps/integration-test/srt.1441320379332/json.groovy#0}
 81 LOG SCRIPT ERROR: groovy.lang.MissingMethodException: No signature of 
method: org.codehaus.groovy.jsr223.GroovyScriptEngineImpl.jsonBuilder() is 
applicable for argument types: (Script2$_run_closure1) values: 
[Script2$_run_closure1@179ee0a]
 81 TIMER_END{78,/apps/integration-test/srt.1441320379332/json.groovy#0}
 81 LOG Filter timing: filter=org.apache.sling.i18n.impl.I18NFilter, 
inner=78, total=78, outer=0
 81 LOG Filter 

Jenkins build became unstable: sling-trunk-1.8 #1470

2015-09-03 Thread Apache Jenkins Server
See 



Jenkins build is still unstable: sling-contrib-1.7 #321

2015-09-03 Thread Apache Jenkins Server
See 



Jenkins build became unstable: sling-trunk-1.8 #1475

2015-09-03 Thread Apache Jenkins Server
See