Nexus: Staging Completed

2015-08-17 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDescription:Apache Sling Testing OSGi Mock 1.5.0, ResourceResolver Mock 1.1.8Deployer properties:"userAgent" = "Apache-Maven/3.3.3 (Java 1.8.0_25; Windows 7 6.1)""userId" = "sseifert""ip" = "91.65.213.67"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0.jar(SHA1: 8c56e377eafb98d9577371cf9582dc85ad331977)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0.pom(SHA1: 3f23e5f1d37fd675695b87aca7451a60e6c98242)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0-source-release.zip.asc(SHA1: 2dca1b83a0fcb686783c19b77b9f442832dcd116)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0.pom.asc(SHA1: ea1ec543c0d553ec4f4873ec9190fe981ab89fe6)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0-sources.jar.asc(SHA1: 685c46a69108806edd27f2fc9b4d19007cc8ad76)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0.jar.asc(SHA1: dbbc25f8e50cef7d54818dbf2ed716d2e62397fc)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0-sources.jar(SHA1: 7e4d408aa04e44d8a443f1a19cf2fbcf4132fd49)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0-source-release.zip(SHA1: df17fa8aa3a0badb3b8be51a09994189c086ab4e)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0-javadoc.jar(SHA1: 973d2ef9c33659be9533504b9edb21547d8b8832)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.5.0/org.apache.sling.testing.osgi-mock-1.5.0-javadoc.jar.asc(SHA1: fd94cca2311fb273bf4d1c5876faeb9eeb56f03d)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8-javadoc.jar(SHA1: 52a65b82c179caa5f0476adb7b3be6790d383e24)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8-sources.jar(SHA1: 0aef314c16fd447eec4422fe961924a46902f9ca)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8-source-release.zip.asc(SHA1: 444a39f58768137cbeae1d339f21729c34e6d807)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8-javadoc.jar.asc(SHA1: e9ab38a1d81cc4a3a630e4bc88d70ac97d3d388f)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8.jar(SHA1: 51163d8031cbd0043af8606d041f4dbdff67fb1c)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8.pom.asc(SHA1: 5e67671206a919827ca31098145384661a990cdd)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8-sources.jar.asc(SHA1: 10b4706e2a411aaa62ce641a1231f23041149f09)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8-source-release.zip(SHA1: aad552698da7595d6d6a2be1948c282d8d44c0f0)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8.jar.asc(SHA1: dd16e6dd4fc70d439a364ec23edfd26fee5b9bf1)/org/apache/sling/org.apache.sling.testing.resourceresolver-mock/1.1.8/org.apache.sling.testing.resourceresolver-mock-1.1.8.pom(SHA1: 610666880c18cdecc70cdb531add44420840614a)Action performed by Stefan Seifert (sseifert)

Jenkins build is unstable: sling-trunk-1.7 #2135

2015-08-17 Thread Apache Jenkins Server
See https://builds.apache.org/job/sling-trunk-1.7/2135/changes



svn commit: r1696258 - in /sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting: ./ javascript/ javascript/wrapper/ wrapper/

2015-08-17 Thread radu
Author: radu
Date: Mon Aug 17 12:13:59 2015
New Revision: 1696258

URL: http://svn.apache.org/r1696258
Log:
trivial: reorganised test packages

Added:

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java
  - copied, changed from r1696254, 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java
  - copied, changed from r1696254, 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
  - copied, changed from r1696254, 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java
  - copied, changed from r1696254, 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableVersionTest.java
  - copied, changed from r1696254, 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java
Removed:

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java
Modified:

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java

Copied: 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java
 (from r1696254, 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java)
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.javap1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.javar1=1696254r2=1696258rev=1696258view=diff
==
--- 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java
 (original)
+++ 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java
 Mon Aug 17 12:13:59 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.scripting;
+package org.apache.sling.scripting.javascript;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;

Copied: 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java
 (from r1696254, 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java)
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.javap1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.javar1=1696254r2=1696258rev=1696258view=diff
==
--- 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java
 (original)
+++ 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java
 Mon Aug 17 12:13:59 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.scripting;
+package org.apache.sling.scripting.javascript;
 
 import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper;
 

Modified: 

svn commit: r1696259 - /sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java

2015-08-17 Thread radu
Author: radu
Date: Mon Aug 17 12:20:18 2015
New Revision: 1696259

URL: http://svn.apache.org/r1696259
Log:
SLING-4693 - Write Sightly generated classes' source code to disk when the 
scripting engine is in dev mode

* updated description for the OSGi org.apache.sling.scripting.sightly.devmode 
configuration property

Modified:

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

Modified: 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java?rev=1696259r1=1696258r2=1696259view=diff
==
--- 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
 Mon Aug 17 12:20:18 2015
@@ -46,7 +46,9 @@ import org.osgi.service.component.Compon
 name = SightlyEngineConfiguration.SCR_PROP_NAME_DEVMODE,
 boolValue = 
SightlyEngineConfiguration.SCR_PROP_DEFAULT_DEVMODE,
 label = Development Mode,
-description = If enabled, Sightly components will be 
recompiled at every request instead of loading objects from memory. Also this 
will give out the Java classes' source via the ClassLoaderWriter.
+description = If enabled, Sightly components will be 
recompiled at every request instead of loading objects from memory. +
+ This will also write the generated Java classes' source 
code for Sightly templates through the ClassLoaderWriter  +
+service.
 ),
 @Property(
 name = SightlyEngineConfiguration.SCR_PROP_NAME_ENCODING,




svn commit: r1696254 - in /sling/trunk/bundles/scripting/javascript/src: main/java/org/apache/sling/scripting/javascript/internal/ main/java/org/apache/sling/scripting/javascript/wrapper/ test/java/or

2015-08-17 Thread radu
Author: radu
Date: Mon Aug 17 12:08:51 2015
New Revision: 1696254

URL: http://svn.apache.org/r1696254
Log:
SLING-4953 - Enhance the JavaScript API provided by the 
org.apache.sling.scripting.javascript bundle

* added a wrapper for Map objects so that Map keys are mapped as object 
properties for the JavaScript object
representing the map
* added a 'properties' property for Javascript objects representing resources

Added:

sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java
Modified:

sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java

sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java

Modified: 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java?rev=1696254r1=1696253r2=1696254view=diff
==
--- 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java
 (original)
+++ 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java
 Mon Aug 17 12:08:51 2015
@@ -42,6 +42,7 @@ import org.apache.sling.scripting.javasc
 import org.apache.sling.scripting.javascript.helper.SlingWrapFactory;
 import org.apache.sling.scripting.javascript.wrapper.ScriptableCalendar;
 import org.apache.sling.scripting.javascript.wrapper.ScriptableItemMap;
+import org.apache.sling.scripting.javascript.wrapper.ScriptableMap;
 import org.apache.sling.scripting.javascript.wrapper.ScriptableNode;
 import org.apache.sling.scripting.javascript.wrapper.ScriptablePrintWriter;
 import org.apache.sling.scripting.javascript.wrapper.ScriptableProperty;
@@ -99,7 +100,7 @@ public class RhinoJavaScriptEngineFactor
 ScriptableResource.class, ScriptableNode.class,
 ScriptableProperty.class, ScriptableItemMap.class,
 ScriptablePrintWriter.class, ScriptableVersionHistory.class,
-ScriptableVersion.class, ScriptableCalendar.class
+ScriptableVersion.class, ScriptableCalendar.class, 
ScriptableMap.class
 };
 
 /**

Added: 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java?rev=1696254view=auto
==
--- 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java
 (added)
+++ 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java
 Mon Aug 17 12:08:51 2015
@@ -0,0 +1,88 @@
+/*
+ * 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.javascript.wrapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.sling.scripting.javascript.SlingWrapper;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.Undefined;
+
+/**
+ * The {@code ScriptableMap} wrapper provides easier access to a map's values 
by setting the map's keys as properties to the JavaScript
+ * object representing the {@link Map}.
+ */
+public class ScriptableMap extends ScriptableBase implements SlingWrapper {
+
+public static final 

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

2015-08-17 Thread Apache Jenkins Server
See https://builds.apache.org/job/sling-contrib-1.7/changes



svn commit: r1696298 - in /sling/trunk/launchpad: base/ base/src/main/java/org/apache/sling/launchpad/base/webapp/ base/src/main/java/org/apache/sling/launchpad/webapp/ base/src/main/webapp/WEB-INF/ b

2015-08-17 Thread cziegeler
Author: cziegeler
Date: Mon Aug 17 14:47:30 2015
New Revision: 1696298

URL: http://svn.apache.org/r1696298
Log:
SLING-4954 : Update to Apache Felix Http 3

Modified:
sling/trunk/launchpad/base/pom.xml

sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java

sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java

sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java

sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingSessionListener.java
sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml
sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt
sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt

Modified: sling/trunk/launchpad/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1696298r1=1696297r2=1696298view=diff
==
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Mon Aug 17 14:47:30 2015
@@ -41,10 +41,6 @@
 by the various launchpad modules..
 /description
 
-properties
-felix.httpservice.version2.3.2/felix.httpservice.version
-/properties
-
 scm
 
connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base/connection
 
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base/developerConnection
@@ -275,13 +271,13 @@
 dependency
 groupIdorg.apache.felix/groupId
 artifactIdorg.apache.felix.http.proxy/artifactId
-version${felix.httpservice.version}/version
+version3.0.0/version
 scopeprovided/scope
 /dependency
 dependency
 groupIdorg.apache.felix/groupId
 artifactIdorg.apache.felix.http.bridge/artifactId
-version${felix.httpservice.version}/version
+version3.0.0/version
 scopeprovided/scope
 /dependency
 dependency

Modified: 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java?rev=1696298r1=1696297r2=1696298view=diff
==
--- 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java
 (original)
+++ 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java
 Mon Aug 17 14:47:30 2015
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSessionLis
 
 import org.apache.felix.http.proxy.ProxyListener;
 
+@Deprecated
 public class SlingHttpSessionListenerDelegate implements
 HttpSessionAttributeListener, HttpSessionListener,
 ServletContextListener {
@@ -35,34 +36,41 @@ public class SlingHttpSessionListenerDel
 
 // -- ServletContextListener
 
+@Override
 public void contextInitialized(final ServletContextEvent sce) {
 this.proxyListener.contextInitialized(sce);
 }
 
+@Override
 public void contextDestroyed(final ServletContextEvent sce) {
 this.proxyListener.contextDestroyed(sce);
 }
 
 // -- HttpSessionListener
 
+@Override
 public void sessionCreated(HttpSessionEvent se) {
 proxyListener.sessionCreated(se);
 }
 
+@Override
 public void sessionDestroyed(HttpSessionEvent se) {
 proxyListener.sessionDestroyed(se);
 }
 
 // -- HttpSessionAttributeListener
 
+@Override
 public void attributeAdded(HttpSessionBindingEvent se) {
 proxyListener.attributeAdded(se);
 }
 
+@Override
 public void attributeRemoved(HttpSessionBindingEvent se) {
 proxyListener.attributeRemoved(se);
 }
 
+@Override
 public void attributeReplaced(HttpSessionBindingEvent se) {
 proxyListener.attributeReplaced(se);
 }

Modified: 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java?rev=1696298r1=1696297r2=1696298view=diff
==
--- 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
 (original)
+++ 

svn commit: r962119 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/validation.html

2015-08-17 Thread buildbot
Author: buildbot
Date: Mon Aug 17 13:44:44 2015
New Revision: 962119

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/documentation/bundles/validation.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Aug 17 13:44:44 2015
@@ -1 +1 @@
-1696197
+1696274

Modified: 
websites/staging/sling/trunk/content/documentation/bundles/validation.html
==
--- websites/staging/sling/trunk/content/documentation/bundles/validation.html 
(original)
+++ websites/staging/sling/trunk/content/documentation/bundles/validation.html 
Mon Aug 17 13:44:44 2015
@@ -175,11 +175,7 @@ This documentation is still work in prog
 
 pAll methods to retrieve a validation model support a boolean parameter 
codeconsiderResourceSuperTypeModels/code. If this is set to true, the 
validation model is not only being looked up for exactly the given resource 
type but also for all its resource super types. The returned model is then a 
merged model of all found validation model along the resource type 
hierarchy./p
 h1 id=validation-model-resourcesValidation Model Resourcesa 
class=headerlink href=#validation-model-resources title=Permanent 
linkpara;/a/h1
-pThe codeValidationModel/code is constructed from resources with the 
resourceType strongsling/validation/model/strong. Those resources are 
considered validation model resources if they are located/p
-ul
-libelow the Sling ResourceResolver search paths (em/apps/em and 
em/libs/em) strongand/strong/li
-libelow a node named strongvalidation/strong./li
-/ul
+pThe codeValidationModel/code is constructed from resources with the 
resourceType strongsling/validation/model/strong. Those resources are 
considered validation model resources if they are located below the Sling 
ResourceResolver search paths (em/apps/em and em/libs/em)./p
 pThe resources should have the following format:/p
 table class=table
 thead
@@ -328,7 +324,7 @@ That interface defines the method code
 lia 
href=http://www.slideshare.net/raducotescu/apache-sling-generic-validation-framework;Apache
 Sling Generic Validation Framework, adaptTo 2014/a/li
 /ol
   div class=timestamp style=margin-top: 30px; font-size: 80%; 
text-align: right;
-Rev. 1693196 by kwin on Wed, 29 Jul 2015 07:39:42 +
+Rev. 1696274 by kwin on Mon, 17 Aug 2015 13:44:33 +
   /div
   div class=trademarkFooter 
 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project




svn commit: r1696274 - /sling/site/trunk/content/documentation/bundles/validation.mdtext

2015-08-17 Thread kwin
Author: kwin
Date: Mon Aug 17 13:44:33 2015
New Revision: 1696274

URL: http://svn.apache.org/r1696274
Log:
SLING-4951 document changes regarding the removal of the path constraint

Modified:
sling/site/trunk/content/documentation/bundles/validation.mdtext

Modified: sling/site/trunk/content/documentation/bundles/validation.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/validation.mdtext?rev=1696274r1=1696273r2=1696274view=diff
==
--- sling/site/trunk/content/documentation/bundles/validation.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/validation.mdtext Mon Aug 17 
13:44:33 2015
@@ -51,10 +51,7 @@ Apart from that it is also possible to v
 All methods to retrieve a validation model support a boolean parameter 
`considerResourceSuperTypeModels`. If this is set to true, the validation model 
is not only being looked up for exactly the given resource type but also for 
all its resource super types. The returned model is then a merged model of all 
found validation model along the resource type hierarchy.
 
 # Validation Model Resources
-The `ValidationModel` is constructed from resources with the resourceType 
**sling/validation/model**. Those resources are considered validation model 
resources if they are located
-
-*  below the Sling ResourceResolver search paths (*/apps* and */libs*) **and**
-*  below a node named **validation**.
+The `ValidationModel` is constructed from resources with the resourceType 
**sling/validation/model**. Those resources are considered validation model 
resources if they are located below the Sling ResourceResolver search paths 
(*/apps* and */libs*).
  
 The resources should have the following format:
 




svn commit: r1696271 - in /sling/trunk/bundles/extensions/validation/core/src: main/java/org/apache/sling/validation/impl/resourcemodel/ test/java/org/apache/sling/validation/impl/resourcemodel/

2015-08-17 Thread kwin
Author: kwin
Date: Mon Aug 17 13:36:33 2015
New Revision: 1696271

URL: http://svn.apache.org/r1696271
Log:
SLING-4951 remove path constraint for validation resources (that it has to be 
placed below a resource named validation)

Modified:

sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java

sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java

Modified: 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java?rev=1696271r1=1696270r2=1696271view=diff
==
--- 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java
 Mon Aug 17 13:36:33 2015
@@ -70,8 +70,7 @@ import org.slf4j.LoggerFactory;
 @Component
 public class ResourceValidationModelProviderImpl implements 
ValidationModelProvider, EventHandler {
 
-static final String MODEL_XPATH_QUERY = /jcr:root%s/ + 
Constants.MODELS_HOME
-+ /*[@sling:resourceType=\%s\ and @%s=\%s\];
+static final String MODEL_XPATH_QUERY = 
/jcr:root%s/*[@sling:resourceType=\+Constants.VALIDATION_MODEL_RESOURCE_TYPE+\
 and @+Constants.VALIDATED_RESOURCE_TYPE+=\%s\];
 static final String[] TOPICS = { SlingConstants.TOPIC_RESOURCE_REMOVED, 
SlingConstants.TOPIC_RESOURCE_CHANGED,
 SlingConstants.TOPIC_RESOURCE_ADDED };
 
@@ -187,8 +186,7 @@ public class ResourceValidationModelProv
 CollectionValidationModel validationModels = new 
ArrayListValidationModel();
 String[] searchPaths = resourceResolver.getSearchPath();
 for (String searchPath : searchPaths) {
-final String queryString = String.format(MODEL_XPATH_QUERY, 
searchPath,
-Constants.VALIDATION_MODEL_RESOURCE_TYPE, 
Constants.VALIDATED_RESOURCE_TYPE, relativeResourceType);
+final String queryString = String.format(MODEL_XPATH_QUERY, 
searchPath, relativeResourceType);
 IteratorResource models = 
resourceResolver.findResources(queryString, xpath);
 while (models.hasNext()) {
 Resource model = models.next();

Modified: 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java?rev=1696271r1=1696270r2=1696271view=diff
==
--- 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java
 Mon Aug 17 13:36:33 2015
@@ -220,6 +220,25 @@ public class ResourceValidationModelProv
 }
 
 @Test
+public void testGetValidationModelOutsideSearchPath() throws Exception {
+// build two models manually (which are identical except for the 
applicable path)
+ValidationModel model1 = modelBuilder.build(sling/validation/test);
+
+Resource contentValidatorsRoot = ResourceUtil.getOrCreateResource(rr, 
/content,
+(MapString, Object) null, sling:Folder, true);
+try {
+// build models in JCR outside any search path /apps or /libs
+createValidationModelResource(rr, contentValidatorsRoot.getPath(), 
testValidationModel1, model1);
+
+// check that no model is found
+CollectionValidationModel models = 
modelProvider.getModel(sling/validation/test, validatorMap, rr);
+Assert.assertThat(Model was placed outside resource resolver 
search path but still found, models, Matchers.empty());
+} finally {
+rr.delete(contentValidatorsRoot);
+}
+}
+
+@Test
 public void testGetValidationModelWithChildren() throws Exception {
 // build two models manually (which are identical except for the 
applicable path)
 ResourcePropertyBuilder resourcePropertyBuilder = new 
ResourcePropertyBuilder();




svn commit: r1696301 - in /sling/trunk/bundles/extensions/validation/core/src: main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java test/java/org/apache/sling/validation/impl/V

2015-08-17 Thread kwin
Author: kwin
Date: Mon Aug 17 14:55:34 2015
New Revision: 1696301

URL: http://svn.apache.org/r1696301
Log:
SLING-4955 fix NPE whenever there was no model associated with the resource 
super type

Modified:

sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java

sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java

Modified: 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java?rev=1696301r1=1696300r2=1696301view=diff
==
--- 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java
 Mon Aug 17 14:55:34 2015
@@ -111,10 +111,12 @@ public class ValidationModelRetrieverImp
 CollectionValidationModel modelsToMerge = new 
ArrayListValidationModel();
 while ((currentResourceType = 
resourceResolver.getParentResourceType(currentResourceType)) != null) {
 ValidationModel modelToMerge = getModel(currentResourceType, 
resourcePath, resourceResolver);
-if (baseModel == null) {
-baseModel = modelToMerge;
-} else {
-modelsToMerge.add(modelToMerge);
+if (modelToMerge != null) {
+if (baseModel == null) {
+baseModel = modelToMerge;
+} else {
+modelsToMerge.add(modelToMerge);
+}
 }
 }
 if (!modelsToMerge.isEmpty()) {

Modified: 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java?rev=1696301r1=1696300r2=1696301view=diff
==
--- 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java
 Mon Aug 17 14:55:34 2015
@@ -198,4 +198,37 @@ public class ValidationModelRetrieverImp
 Assert.assertNotNull(model);
 Assert.assertThat(model.getResourceProperties(), 
Matchers.containsInAnyOrder(new ResourcePropertyNameMatcher(test/type), new 
ResourcePropertyNameMatcher(test/supertype)));
 }
+
+@Test
+public void 
testGetModelWithResourceInheritanceAndNoSuitableBaseModelFound() {
+// no model found for base type and no resource super type set
+ValidationModel model = validationModelRetriever.getModel(test/type, 
/content/site1, true, resourceResolver);
+Assert.assertNull(Found model although no model has been specified, 
model);
+
+// set super super type
+
Mockito.when(resourceResolver.getParentResourceType(test/type)).thenReturn(test/supertype);
+// no model found at all (neither base nor super type)
+model = validationModelRetriever.getModel(test/type, 
/content/site1, true, resourceResolver);
+Assert.assertNull(Found model although no model has been specified 
(neither in base nor in super type), model);
+
+validationModelRetriever.validationModelsCache.clear();
+
+// only supertype has model being set
+applicablePathPerResourceType.put(test/supertype, /content/site1);
+model = validationModelRetriever.getModel(test/type, 
/content/site1, true, resourceResolver);
+Assert.assertNotNull(model);
+Assert.assertThat(model.getResourceProperties(), Matchers.contains(new 
ResourcePropertyNameMatcher(test/supertype)));
+}
+
+@Test
+public void 
testGetModelWithResourceInheritanceAndNoModelForSuperTypeFound() {
+applicablePathPerResourceType.put(test/type, /content/site1);
+
Mockito.when(resourceResolver.getParentResourceType(test/type)).thenReturn(test/supertype);
+
Mockito.when(resourceResolver.getParentResourceType(test/supertype)).thenReturn(test/supersupertype);
+
+// only model found for base type
+ValidationModel model = validationModelRetriever.getModel(test/type, 
/content/site1, true, resourceResolver);
+

Build failed in Jenkins: sling-trunk-1.8 #1426

2015-08-17 Thread Apache Jenkins Server
See https://builds.apache.org/job/sling-trunk-1.8/1426/changes

Changes:

[cziegeler] SLING-4954 : Update to Apache Felix Http 3

[kwin] SLING-4951 remove path constraint for validation resources (that it has 
to be placed below a resource named validation)

[radu] trivial: removed empty folder

[radu] SLING-4693 - Write Sightly generated classes' source code to disk when 
the scripting engine is in dev mode

* updated description for the OSGi org.apache.sling.scripting.sightly.devmode 
configuration property

[radu] trivial: reorganised test packages

[radu] SLING-4953 - Enhance the JavaScript API provided by the 
org.apache.sling.scripting.javascript bundle

* added a wrapper for Map objects so that Map keys are mapped as object 
properties for the JavaScript object
representing the map
* added a 'properties' property for Javascript objects representing resources

--
[...truncated 55641 lines...]
[INFO] Apache Sling Scripting Sightly Read-Eval-Print Loop Environment  SUCCESS 
[3.660s]
[INFO] Apache Sling Scripting Sightly Integration Tests Content  SUCCESS 
[5.657s]
[INFO] Apache Sling Launchpad Base ... FAILURE [3.024s]
[INFO] Apache Sling Adapter Manager Implementation ... SKIPPED
[INFO] Apache Sling Launchpad Application Builder  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests .. SKIPPED
[INFO] Apache Sling Scripting Sightly Models Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Reactor  SKIPPED
[INFO] Apache Sling Bundle Resource Provider . SKIPPED
[INFO] Apache Sling Distributed Event Admin .. SKIPPED
[INFO] Apache Sling Discovery API  SKIPPED
[INFO] Apache Sling Discovery Commons Bundle . SKIPPED
[INFO] Apache Sling Resource-Based Discovery Service . SKIPPED
[INFO] Apache Sling Discovery Support Bundle . SKIPPED
[INFO] Apache Sling Discovery Standalone Implementation .. SKIPPED
[INFO] Apache Sling Event Support  SKIPPED
[INFO] Apache Sling Feature Flags  SKIPPED
[INFO] Apache Sling Filesystem Resource Provider . SKIPPED
[INFO] Apache Sling javax.activation bundle .. SKIPPED
[INFO] Apache Sling Service User Mapper .. SKIPPED
[INFO] Apache Sling Settings . SKIPPED
[INFO] Apache Sling Web Console Branding . SKIPPED
[INFO] Apache Sling Web Console Security Provider  SKIPPED
[INFO] Apache Sling Explorer . SKIPPED
[INFO] Apache Sling Health Check Core  SKIPPED
[INFO] Apache Sling Health Check Annotations . SKIPPED
[INFO] Apache Sling Health Check Samples . SKIPPED
[INFO] Apache Sling Health Check Support Components .. SKIPPED
[INFO] Apache Sling Health Check Webconsole Plugin ... SKIPPED
[INFO] Apache Sling Health Check JUnit Bridge  SKIPPED
[INFO] Apache Sling Health Check Integration Tests ... SKIPPED
[INFO] Apache Sling Health Check Reactor POM . SKIPPED
[INFO] Apache Sling Resource Access Security . SKIPPED
[INFO] Apache Sling Test Tools ... SKIPPED
[INFO] Apache Sling Resource Access Security Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework API . SKIPPED
[INFO] Apache Sling Validation Framework Core Implementation  SKIPPED
[INFO] Apache Sling Validation Framework Testing Services  SKIPPED
[INFO] Apache Sling Validation Framework Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework Examples  SKIPPED
[INFO] Apache Sling Validation Framework Builder . SKIPPED
[INFO] Apache Sling Models API ... SKIPPED
[INFO] Apache Sling Models Implementation  SKIPPED
[INFO] Apache Sling Models Validation Implementation . SKIPPED
[INFO] Apache Sling Models Integration Tests . SKIPPED
[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 

svn commit: r1696341 - /sling/trunk/testing/mocks/resourceresolver-mock/pom.xml

2015-08-17 Thread sseifert
Author: sseifert
Date: Mon Aug 17 21:30:57 2015
New Revision: 1696341

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

Modified:
sling/trunk/testing/mocks/resourceresolver-mock/pom.xml

Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/pom.xml?rev=1696341r1=1696340r2=1696341view=diff
==
--- sling/trunk/testing/mocks/resourceresolver-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Mon Aug 17 21:30:57 
2015
@@ -28,7 +28,7 @@
 /parent
 
 artifactIdorg.apache.sling.testing.resourceresolver-mock/artifactId
-version1.1.8/version
+version1.1.9-SNAPSHOT/version
 
 nameApache Sling Testing Resource Resolver Mock/name
 description
@@ -36,9 +36,9 @@
 /description
 
 scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.8/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.8/developerConnection
-
urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.8/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock/developerConnection
+
urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/url
 /scm
 
 reporting




svn commit: r1696339 - /sling/trunk/testing/mocks/resourceresolver-mock/pom.xml

2015-08-17 Thread sseifert
Author: sseifert
Date: Mon Aug 17 21:30:41 2015
New Revision: 1696339

URL: http://svn.apache.org/r1696339
Log:
[maven-release-plugin] prepare release 
org.apache.sling.testing.resourceresolver-mock-1.1.8

Modified:
sling/trunk/testing/mocks/resourceresolver-mock/pom.xml

Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/pom.xml?rev=1696339r1=1696338r2=1696339view=diff
==
--- sling/trunk/testing/mocks/resourceresolver-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Mon Aug 17 21:30:41 
2015
@@ -24,11 +24,11 @@
 groupIdorg.apache.sling/groupId
 artifactIdsling/artifactId
 version24/version
-relativePath/
+relativePath /
 /parent
 
 artifactIdorg.apache.sling.testing.resourceresolver-mock/artifactId
-version1.1.7-SNAPSHOT/version
+version1.1.8/version
 
 nameApache Sling Testing Resource Resolver Mock/name
 description
@@ -36,9 +36,9 @@
 /description
 
 scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock/developerConnection
-
urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.8/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.8/developerConnection
+
urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.8/url
 /scm
 
 reporting




svn commit: r1696340 - /sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.8/

2015-08-17 Thread sseifert
Author: sseifert
Date: Mon Aug 17 21:30:54 2015
New Revision: 1696340

URL: http://svn.apache.org/r1696340
Log:
[maven-release-plugin] copy for tag 
org.apache.sling.testing.resourceresolver-mock-1.1.8

Added:
sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.8/
  - copied from r1696339, sling/trunk/testing/mocks/resourceresolver-mock/



svn commit: r1696343 - /sling/tags/org.apache.sling.testing.osgi-mock-1.5.0/

2015-08-17 Thread sseifert
Author: sseifert
Date: Mon Aug 17 21:32:52 2015
New Revision: 1696343

URL: http://svn.apache.org/r1696343
Log:
[maven-release-plugin] copy for tag org.apache.sling.testing.osgi-mock-1.5.0

Added:
sling/tags/org.apache.sling.testing.osgi-mock-1.5.0/
  - copied from r1696342, sling/trunk/testing/mocks/osgi-mock/



svn commit: r1696342 - /sling/trunk/testing/mocks/osgi-mock/pom.xml

2015-08-17 Thread sseifert
Author: sseifert
Date: Mon Aug 17 21:32:38 2015
New Revision: 1696342

URL: http://svn.apache.org/r1696342
Log:
[maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock-1.5.0

Modified:
sling/trunk/testing/mocks/osgi-mock/pom.xml

Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1696342r1=1696341r2=1696342view=diff
==
--- sling/trunk/testing/mocks/osgi-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/osgi-mock/pom.xml Mon Aug 17 21:32:38 2015
@@ -24,20 +24,20 @@
 groupIdorg.apache.sling/groupId
 artifactIdsling/artifactId
 version24/version
-relativePath/
+relativePath /
 /parent
 
 artifactIdorg.apache.sling.testing.osgi-mock/artifactId
-version1.4.1-SNAPSHOT/version
+version1.5.0/version
 packagingbundle/packaging
 
 nameApache Sling Testing OSGi Mock/name
 descriptionMock implementation of selected OSGi APIs./description
 
 scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock/developerConnection
-
urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.5.0/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.5.0/developerConnection
+
urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-1.5.0/url
 /scm
 
 dependencies




svn commit: r1696344 - /sling/trunk/testing/mocks/osgi-mock/pom.xml

2015-08-17 Thread sseifert
Author: sseifert
Date: Mon Aug 17 21:32:54 2015
New Revision: 1696344

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

Modified:
sling/trunk/testing/mocks/osgi-mock/pom.xml

Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1696344r1=1696343r2=1696344view=diff
==
--- sling/trunk/testing/mocks/osgi-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/osgi-mock/pom.xml Mon Aug 17 21:32:54 2015
@@ -28,16 +28,16 @@
 /parent
 
 artifactIdorg.apache.sling.testing.osgi-mock/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
 packagingbundle/packaging
 
 nameApache Sling Testing OSGi Mock/name
 descriptionMock implementation of selected OSGi APIs./description
 
 scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.5.0/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.5.0/developerConnection
-
urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-1.5.0/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock/developerConnection
+
urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/url
 /scm
 
 dependencies




Nexus: Promotion Completed

2015-08-17 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.3 (Java 1.7.0_71; Mac OS X 10.10.4)""userId" = "cziegeler""ip" = "193.104.215.11"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0-javadoc.jar(SHA1: d4ac989727148ae3057ae07e5c7707feca27fa74)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0-javadoc.jar.asc(SHA1: b8d58057087b76d92269c7fda080da518c988fa4)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0-sources.jar.asc(SHA1: cd3843b86824208b95a5403afd98e6d4e33cd3f0)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0-source-release.zip.asc(SHA1: c268ea924aa37a3550627453bff44e4c2a85399d)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0.pom(SHA1: 52848cedef8593b715ed989afa7ce24d561bd96f)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0-source-release.zip(SHA1: a1ae9fdacdd6ae6096c2d2fb56f9b68c6a10ee7a)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0.pom.asc(SHA1: 42f94c1d6288337defe475bc960ee65d43629cd8)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0-sources.jar(SHA1: 87e71d83173ea3335690d032075a918504c20080)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0.jar(SHA1: 248594f6cddc147a40cb39d398a62d840241e3d7)/org/apache/sling/org.apache.sling.jcr.davex/1.3.0/org.apache.sling.jcr.davex-1.3.0.jar.asc(SHA1: 46dbef91283c531496ba588971d6a6dcac937b70)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0-javadoc.jar(SHA1: d0cc3d28459836181992aa4de04327a980fbee51)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0.jar(SHA1: 9aa0b7707a0cc6b2e67e913f980f7d5f10686e26)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0-sources.jar(SHA1: 0d9482a85db8bc62098009a79040c4e70f61bd6a)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0.jar.asc(SHA1: 70941c6568de1199c01f8a248fdd92cc163182db)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0.pom(SHA1: 0d106e9fbc5d5e4f2d529a9d186877d769f71e25)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0.pom.asc(SHA1: 2c078c909bea71e2373b0f8e36f3875cbb25ab47)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0-source-release.zip(SHA1: 2be0a753465b8c4715dedfe4399038201719e47d)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0-source-release.zip.asc(SHA1: bd41a1423617f03c832e0533ddda7c6e8ebcabdd)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0-javadoc.jar.asc(SHA1: 4eba373a8b7319eb5eccddb87d295fa398c68957)/org/apache/sling/org.apache.sling.jcr.webdav/2.3.0/org.apache.sling.jcr.webdav-2.3.0-sources.jar.asc(SHA1: f0b58026dcd98e5934e3c104aa978769b65f3087)Action performed by Carsten Ziegeler (cziegeler)

Nexus: Promotion Completed

2015-08-17 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.3 (Java 1.7.0_71; Mac OS X 10.10.4)""userId" = "cziegeler""ip" = "193.104.215.11"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0-sources.jar.asc(SHA1: bc991d356f9a5c42d7dc9e62345a7dcce0b008bb)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0-source-release.zip(SHA1: f4bd7b0a3e6faa5664ddd356d3c1481001a4dd97)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0.jar(SHA1: a62dc4ec9df46854741622583a8d9a26842e9268)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0-source-release.zip.asc(SHA1: f1fc2442bbc325f3a2ab34162ef4e8472b4d36b1)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0-javadoc.jar.asc(SHA1: 0858170564798b4da449cf0b623d1277fde5c99d)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0.pom.asc(SHA1: 2ea737cbccb4e7a2ccad8989668c099181f635eb)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0-sources.jar(SHA1: 5a9eef42b0c04b84413fa8403f39dad65808935b)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0.jar.asc(SHA1: 247c9f9181d1698a9a95bf7819d765c8eeb3acca)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0-javadoc.jar(SHA1: 789a0b763a81791c54b75733d3f37870d4f54a35)/org/apache/sling/org.apache.sling.jcr.api/2.3.0/org.apache.sling.jcr.api-2.3.0.pom(SHA1: 0dbfd5f3cb14f9ff40f559af3ac71d23207e87e1)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0.jar.asc(SHA1: 454ee820bf2c868a3837549f114b26c2873be266)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0.pom.asc(SHA1: a7387e6fa4e1315986e2e085b10041a6ce24fd86)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0.pom(SHA1: fde029bcd1437b6ab893c083f38fad622baf8dc0)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0.jar(SHA1: d59fe42056bb6ee53c2e9529760831fa5234d3dc)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0-source-release.zip(SHA1: 75aec544dcfe2d33ee0194c26b258e401958818f)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0-sources.jar.asc(SHA1: f7a1dee7407b70cdb9e1e272b04ec033e23f0b0e)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0-source-release.zip.asc(SHA1: c08b939e07bf862f119c8568dd6fe315b8656c10)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0-sources.jar(SHA1: 6bacf36141c915ce7554cd45f3f6a866955c8672)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0-javadoc.jar(SHA1: 512f2edccd298690c4eab83b24bc9e8c2988bace)/org/apache/sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/org.apache.sling.jcr.jackrabbit.server-2.3.0-javadoc.jar.asc(SHA1: 1c955088ceb8905fed546d9a22836cefd458b564)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0.jar(SHA1: 31cab178bf08612a4490ad2c037c8ccfa8872f02)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0-source-release.zip.asc(SHA1: c0f757d1d46dc61caa37e2a4d6006b772f0338ae)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0-source-release.zip(SHA1: a2493807605f80a31fc4a2e456c1389e0587af61)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0-javadoc.jar(SHA1: a2097be148fbaa360341e81241e1ab55251c9eb2)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0.pom(SHA1: c123c188db784ca47b735609a7998efb9ac4916c)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0-javadoc.jar.asc(SHA1: bc7c303e6e049015abe0e01eb80b76bb5638d114)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0.jar.asc(SHA1: 7d00f6c95fdd3441d903eb6eaeaf15110b853245)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0.pom.asc(SHA1: 0ab9a664d3797a82bb81c6b1e98c13ca2459f72c)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0-sources.jar(SHA1: 186ad6622283d2d41f18babf8f39b8b3a64f9b7d)/org/apache/sling/org.apache.sling.jcr.base/2.3.0/org.apache.sling.jcr.base-2.3.0-sources.jar.asc(SHA1: 2c3215cae7400089bfbc840c3a8e4b97f5b62a3f)Action performed by Carsten Ziegeler (cziegeler)

svn commit: r10193 - /release/sling/

2015-08-17 Thread cziegeler
Author: cziegeler
Date: Mon Aug 17 07:14:02 2015
New Revision: 10193

Log:
JCR API 2.3.0, JCR Base 2.3.0, JCR Jackrabbit Server 2.3.0, JCR Davex 1.3.0 and 
JCR Webdav 2.3.0

Added:
release/sling/org.apache.sling.jcr.api-2.3.0-javadoc.jar   (with props)
release/sling/org.apache.sling.jcr.api-2.3.0-javadoc.jar.asc   (with props)
release/sling/org.apache.sling.jcr.api-2.3.0-javadoc.jar.md5
release/sling/org.apache.sling.jcr.api-2.3.0-javadoc.jar.sha1
release/sling/org.apache.sling.jcr.api-2.3.0-source-release.zip   (with 
props)
release/sling/org.apache.sling.jcr.api-2.3.0-source-release.zip.asc   (with 
props)
release/sling/org.apache.sling.jcr.api-2.3.0-source-release.zip.md5   (with 
props)
release/sling/org.apache.sling.jcr.api-2.3.0-source-release.zip.sha1
release/sling/org.apache.sling.jcr.api-2.3.0-sources.jar   (with props)
release/sling/org.apache.sling.jcr.api-2.3.0-sources.jar.asc   (with props)
release/sling/org.apache.sling.jcr.api-2.3.0-sources.jar.md5
release/sling/org.apache.sling.jcr.api-2.3.0-sources.jar.sha1
release/sling/org.apache.sling.jcr.api-2.3.0.jar   (with props)
release/sling/org.apache.sling.jcr.api-2.3.0.jar.asc   (with props)
release/sling/org.apache.sling.jcr.api-2.3.0.jar.md5
release/sling/org.apache.sling.jcr.api-2.3.0.jar.sha1
release/sling/org.apache.sling.jcr.api-2.3.0.pom   (with props)
release/sling/org.apache.sling.jcr.api-2.3.0.pom.asc   (with props)
release/sling/org.apache.sling.jcr.api-2.3.0.pom.md5
release/sling/org.apache.sling.jcr.api-2.3.0.pom.sha1
release/sling/org.apache.sling.jcr.base-2.3.0-javadoc.jar   (with props)
release/sling/org.apache.sling.jcr.base-2.3.0-javadoc.jar.asc   (with props)
release/sling/org.apache.sling.jcr.base-2.3.0-javadoc.jar.md5
release/sling/org.apache.sling.jcr.base-2.3.0-javadoc.jar.sha1
release/sling/org.apache.sling.jcr.base-2.3.0-source-release.zip   (with 
props)
release/sling/org.apache.sling.jcr.base-2.3.0-source-release.zip.asc   
(with props)
release/sling/org.apache.sling.jcr.base-2.3.0-source-release.zip.md5
release/sling/org.apache.sling.jcr.base-2.3.0-source-release.zip.sha1
release/sling/org.apache.sling.jcr.base-2.3.0-sources.jar   (with props)
release/sling/org.apache.sling.jcr.base-2.3.0-sources.jar.asc   (with props)
release/sling/org.apache.sling.jcr.base-2.3.0-sources.jar.md5
release/sling/org.apache.sling.jcr.base-2.3.0-sources.jar.sha1
release/sling/org.apache.sling.jcr.base-2.3.0.jar   (with props)
release/sling/org.apache.sling.jcr.base-2.3.0.jar.asc   (with props)
release/sling/org.apache.sling.jcr.base-2.3.0.jar.md5
release/sling/org.apache.sling.jcr.base-2.3.0.jar.sha1
release/sling/org.apache.sling.jcr.base-2.3.0.pom   (with props)
release/sling/org.apache.sling.jcr.base-2.3.0.pom.asc   (with props)
release/sling/org.apache.sling.jcr.base-2.3.0.pom.md5
release/sling/org.apache.sling.jcr.base-2.3.0.pom.sha1
release/sling/org.apache.sling.jcr.davex-1.3.0-javadoc.jar   (with props)
release/sling/org.apache.sling.jcr.davex-1.3.0-javadoc.jar.asc   (with 
props)
release/sling/org.apache.sling.jcr.davex-1.3.0-javadoc.jar.md5
release/sling/org.apache.sling.jcr.davex-1.3.0-javadoc.jar.sha1
release/sling/org.apache.sling.jcr.davex-1.3.0-source-release.zip   (with 
props)
release/sling/org.apache.sling.jcr.davex-1.3.0-source-release.zip.asc   
(with props)
release/sling/org.apache.sling.jcr.davex-1.3.0-source-release.zip.md5
release/sling/org.apache.sling.jcr.davex-1.3.0-source-release.zip.sha1
release/sling/org.apache.sling.jcr.davex-1.3.0-sources.jar   (with props)
release/sling/org.apache.sling.jcr.davex-1.3.0-sources.jar.asc   (with 
props)
release/sling/org.apache.sling.jcr.davex-1.3.0-sources.jar.md5
release/sling/org.apache.sling.jcr.davex-1.3.0-sources.jar.sha1
release/sling/org.apache.sling.jcr.davex-1.3.0.jar   (with props)
release/sling/org.apache.sling.jcr.davex-1.3.0.jar.asc   (with props)
release/sling/org.apache.sling.jcr.davex-1.3.0.jar.md5
release/sling/org.apache.sling.jcr.davex-1.3.0.jar.sha1
release/sling/org.apache.sling.jcr.davex-1.3.0.pom   (with props)
release/sling/org.apache.sling.jcr.davex-1.3.0.pom.asc   (with props)
release/sling/org.apache.sling.jcr.davex-1.3.0.pom.md5
release/sling/org.apache.sling.jcr.davex-1.3.0.pom.sha1
release/sling/org.apache.sling.jcr.jackrabbit.server-2.3.0-javadoc.jar   
(with props)
release/sling/org.apache.sling.jcr.jackrabbit.server-2.3.0-javadoc.jar.asc  
 (with props)
release/sling/org.apache.sling.jcr.jackrabbit.server-2.3.0-javadoc.jar.md5
release/sling/org.apache.sling.jcr.jackrabbit.server-2.3.0-javadoc.jar.sha1

release/sling/org.apache.sling.jcr.jackrabbit.server-2.3.0-source-release.zip   
(with props)

release/sling/org.apache.sling.jcr.jackrabbit.server-2.3.0-source-release.zip.asc
   

svn commit: r1696196 - /sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java

2015-08-17 Thread kwin
Author: kwin
Date: Mon Aug 17 07:14:04 2015
New Revision: 1696196

URL: http://svn.apache.org/r1696196
Log:
SLING-4693 extend description of the dev mode

Modified:

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

Modified: 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java?rev=1696196r1=1696195r2=1696196view=diff
==
--- 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
 Mon Aug 17 07:14:04 2015
@@ -46,7 +46,7 @@ import org.osgi.service.component.Compon
 name = SightlyEngineConfiguration.SCR_PROP_NAME_DEVMODE,
 boolValue = 
SightlyEngineConfiguration.SCR_PROP_DEFAULT_DEVMODE,
 label = Development Mode,
-description = If enabled, Sightly components will be 
recompiled at every request instead of loading objects from memory.
+description = If enabled, Sightly components will be 
recompiled at every request instead of loading objects from memory. Also this 
will give out the Java classes' source via the ClassLoaderWriter.
 ),
 @Property(
 name = SightlyEngineConfiguration.SCR_PROP_NAME_ENCODING,




svn commit: r962080 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html

2015-08-17 Thread buildbot
Author: buildbot
Date: Mon Aug 17 07:15:47 2015
New Revision: 962080

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Aug 17 07:15:47 2015
@@ -1 +1 @@
-1695814
+1696197

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Mon Aug 17 07:15:47 2015
@@ -653,15 +653,15 @@ h2:hover  .headerlink, h3:hover  .head
 /tr
 tr
 tdJCR API/td
-td2.2.0/td
-tda href=[preferred]/sling/org.apache.sling.jcr.api-2.2.0.jarBundle/a 
(a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.api-2.2.0.jar.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.api-2.2.0.jar.md5;md5/a)/td
-tda 
href=[preferred]/sling/org.apache.sling.jcr.api-2.2.0-source-release.zipSource
 ZIP/a (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.api-2.2.0-source-release.zip.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.api-2.2.0-source-release.zip.md5;md5/a)/td
+td2.3.0/td
+tda href=[preferred]/sling/org.apache.sling.jcr.api-2.3.0.jarBundle/a 
(a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.api-2.3.0.jar.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.api-2.3.0.jar.md5;md5/a)/td
+tda 
href=[preferred]/sling/org.apache.sling.jcr.api-2.3.0-source-release.zipSource
 ZIP/a (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.api-2.3.0-source-release.zip.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.api-2.3.0-source-release.zip.md5;md5/a)/td
 /tr
 tr
 tdJCR Base/td
-td2.2.2/td
-tda href=[preferred]/sling/org.apache.sling.jcr.base-2.2.2.jarBundle/a 
(a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.base-2.2.2.jar.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.base-2.2.2.jar.md5;md5/a)/td
-tda 
href=[preferred]/sling/org.apache.sling.jcr.base-2.2.2-source-release.zipSource
 ZIP/a (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.base-2.2.2-source-release.zip.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.base-2.2.2-source-release.zip.md5;md5/a)/td
+td2.3.0/td
+tda href=[preferred]/sling/org.apache.sling.jcr.base-2.3.0.jarBundle/a 
(a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.base-2.3.0.jar.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.base-2.3.0.jar.md5;md5/a)/td
+tda 
href=[preferred]/sling/org.apache.sling.jcr.base-2.3.0-source-release.zipSource
 ZIP/a (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.base-2.3.0-source-release.zip.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.base-2.3.0-source-release.zip.md5;md5/a)/td
 /tr
 tr
 tdJCR ClassLoader/td
@@ -683,9 +683,9 @@ h2:hover  .headerlink, h3:hover  .head
 /tr
 tr
 tdJCR DavEx/td
-td1.2.2/td
-tda 
href=[preferred]/sling/org.apache.sling.jcr.davex-1.2.2.jarBundle/a (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.davex-1.2.2.jar.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.davex-1.2.2.jar.md5;md5/a)/td
-tda 
href=[preferred]/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zipSource
 ZIP/a (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip.md5;md5/a)/td
+td1.3.0/td
+tda 
href=[preferred]/sling/org.apache.sling.jcr.davex-1.3.0.jarBundle/a (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.davex-1.3.0.jar.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.davex-1.3.0.jar.md5;md5/a)/td
+tda 
href=[preferred]/sling/org.apache.sling.jcr.davex-1.3.0-source-release.zipSource
 ZIP/a (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.davex-1.3.0-source-release.zip.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.davex-1.3.0-source-release.zip.md5;md5/a)/td
 /tr
 tr
 tdJCR Jackrabbit AccessManager/td
@@ -695,9 +695,9 @@ h2:hover  .headerlink, h3:hover  .head
 /tr
 tr
 tdJCR Jackrabbit Server/td
-td2.2.0/td
-tda 
href=[preferred]/sling/org.apache.sling.jcr.jackrabbit.server-2.2.0.jarBundle/a
 (a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.jackrabbit.server-2.2.0.jar.asc;asc/a,
 a 
href=http://www.apache.org/dist/sling/org.apache.sling.jcr.jackrabbit.server-2.2.0.jar.md5;md5/a)/td
-tda 

svn commit: r1696197 - in /sling/site/trunk/content: downloads.list news.mdtext

2015-08-17 Thread cziegeler
Author: cziegeler
Date: Mon Aug 17 07:15:33 2015
New Revision: 1696197

URL: http://svn.apache.org/r1696197
Log:
JCR API 2.3.0, JCR Base 2.3.0, JCR Jackrabbit Server 2.3.0, JCR Davex 1.3.0 and 
JCR Webdav 2.3.0

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1696197r1=1696196r2=1696197view=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Mon Aug 17 07:15:33 2015
@@ -84,15 +84,15 @@ Installer Subystems Support|org.apache.s
 Installer File Provider|org.apache.sling.installer.provider.file|1.1.0
 Installer JCR Provider|org.apache.sling.installer.provider.jcr|3.1.16
 javax activation|org.apache.sling.javax.activation|0.1.0
-JCR API|org.apache.sling.jcr.api|2.2.0
+JCR API|org.apache.sling.jcr.api|2.3.0
 JCR API Wrapper|org.apache.sling.jcr.jcr-wrapper|2.0.0
-JCR Base|org.apache.sling.jcr.base|2.2.2
+JCR Base|org.apache.sling.jcr.base|2.3.0
 JCR ClassLoader|org.apache.sling.jcr.classloader|3.2.2
 JCR Compiler|org.apache.sling.jcr.compiler|2.1.0
 JCR ContentLoader|org.apache.sling.jcr.contentloader|2.1.10
-JCR DavEx|org.apache.sling.jcr.davex|1.2.2
+JCR DavEx|org.apache.sling.jcr.davex|1.3.0
 JCR Jackrabbit 
AccessManager|org.apache.sling.jcr.jackrabbit.accessmanager|2.1.2
-JCR Jackrabbit Server|org.apache.sling.jcr.jackrabbit.server|2.2.0
+JCR Jackrabbit Server|org.apache.sling.jcr.jackrabbit.server|2.3.0
 JCR Jackrabbit UserManager|org.apache.sling.jcr.jackrabbit.usermanager|2.2.2
 JCR Prefs|org.apache.sling.jcr.prefs|1.0.0
 JCR Registration|org.apache.sling.jcr.registration|1.0.2
@@ -100,7 +100,7 @@ JCR Resource|org.apache.sling.jcr.resour
 JCR Resource Security|org.apache.sling.jcr.resourcesecurity|1.0.2
 JCR Web Console Plugin|org.apache.sling.jcr.webconsole|1.0.2
 JXM Resource Provider|org.apache.sling.jmx.provider|1.0.2
-JCR WebDAV|org.apache.sling.jcr.webdav|2.2.2
+JCR WebDAV|org.apache.sling.jcr.webdav|2.3.0
 JUnit Core|org.apache.sling.junit.core|1.0.10
 JUnit Remote Tests Runners|org.apache.sling.junit.remote|1.0.10
 JUnit Scriptable Tests Provider|org.apache.sling.junit.scriptable|1.0.10

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1696197r1=1696196r2=1696197view=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Mon Aug 17 07:15:33 2015
@@ -1,5 +1,6 @@
 Title: News
 
+* New Releases: Apache Sling JCR API 2.3.0, Apache Sling JCR Base 2.3.0, 
Apache Sling JCR Jackrabbit Server 2.3.0, Apache Sling JCR Davex 1.3.0 and 
Apache Sling JCR Webdav 2.3.0 (August 17th, 2015)
 * New Release: Apache Sling Commons Scheduler 2.4.10 (August 14th, 2015)
 * New Releases: Apache Sling i18n 2.4.4, Apache Sling Scripting Core 2.0.34, 
Apache Sling Scripting JavaScript 2.0.22, Apache Sling Scripting Sightly JS Use 
Provider 1.0.8 (August 13th, 2015)
 * New Releases: Apache Sling Commons Log 4.0.6 (August 11th, 2015)




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

2015-08-17 Thread olli
Author: olli
Date: Mon Aug 17 20:03:14 2015
New Revision: 1696332

URL: http://svn.apache.org/r1696332
Log:
SLING-3027 use latest releases (Sling Commons Scheduler, Sling i18n, Sling JCR 
API, Sling JCR Base, Sling JCR DavEx, Sling JCR WebDav, Sling JCR Jackrabbit 
Server, Sling Scripting Core, Sling Scripting Javascript, Sling Scripting 
Sightly JS Provider)

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=1696332r1=1696331r2=1696332view=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
 Mon Aug 17 20:03:14 2015
@@ -66,7 +66,7 @@
   /feature
   !-- Apache Sling Commons --
   feature name=sling-commons-scheduler version=${project.version}
-
bundlemvn:org.apache.sling/org.apache.sling.commons.scheduler/2.4.8/bundle
+
bundlemvn:org.apache.sling/org.apache.sling.commons.scheduler/2.4.10/bundle
 !-- dependencies --
 featurescr/feature
 feature version=${project.version}sling-commons-threads/feature
@@ -130,7 +130,7 @@
 feature version=${project.version}sling/feature
   /feature
   feature name=sling-extension-i18n version=${project.version}
-bundlemvn:org.apache.sling/org.apache.sling.i18n/2.3.2/bundle
+bundlemvn:org.apache.sling/org.apache.sling.i18n/2.4.4/bundle
 !-- dependencies --
 feature version=${project.version}sling/feature
   /feature
@@ -188,16 +188,16 @@
   /feature
   !-- Apache Sling JCR --
   feature name=sling-jcr version=${project.version}
-bundlemvn:org.apache.sling/org.apache.sling.jcr.api/2.2.0/bundle
-bundlemvn:org.apache.sling/org.apache.sling.jcr.base/2.2.2/bundle
+bundlemvn:org.apache.sling/org.apache.sling.jcr.api/2.3.0/bundle
+bundlemvn:org.apache.sling/org.apache.sling.jcr.base/2.3.0/bundle
 
bundlemvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2/bundle
 
bundlemvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10/bundle
-bundlemvn:org.apache.sling/org.apache.sling.jcr.davex/1.2.2/bundle
+bundlemvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.0/bundle
 !-- (not using org.apache.sling.jcr.jcr-wrapper) --
 
bundlemvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.2/bundle
 bundlemvn:org.apache.sling/org.apache.sling.jcr.resource/2.5.4/bundle
 bundlemvn:org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2/bundle
-bundlemvn:org.apache.sling/org.apache.sling.jcr.webdav/2.2.2/bundle
+bundlemvn:org.apache.sling/org.apache.sling.jcr.webdav/2.3.0/bundle
 !-- dependencies --
 featurewebconsole/feature
 feature version=${project.version}sling/feature
@@ -212,7 +212,7 @@
   /feature
   !-- Apache Sling JCR Jackrabbit --
   feature name=sling-jcr-jackrabbit version=${project.version}
-
bundlemvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.2.0/bundle
+
bundlemvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.3.0/bundle
 !-- dependencies --
 feature version=${project.version}sling-jcr/feature
 
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1/bundle
@@ -318,14 +318,14 @@
   !-- Apache Sling Scripting --
   feature name=sling-scripting version=${project.version}
 bundlemvn:org.apache.sling/org.apache.sling.scripting.api/2.1.8/bundle
-
bundlemvn:org.apache.sling/org.apache.sling.scripting.core/2.0.32/bundle
+
bundlemvn:org.apache.sling/org.apache.sling.scripting.core/2.0.34/bundle
 !-- dependencies --
 feature version=${project.version}sling/feature
 featurewebconsole/feature
 
bundlemvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0/bundle
   /feature
   feature name=sling-scripting-javascript version=${project.version}
-
bundlemvn:org.apache.sling/org.apache.sling.scripting.javascript/2.0.20/bundle
+
bundlemvn:org.apache.sling/org.apache.sling.scripting.javascript/2.0.22/bundle
 !-- dependencies --
 feature version=${project.version}sling-scripting/feature
 feature version=${project.version}sling-jcr/feature
@@ -338,7 +338,7 @@
   /feature
   feature name=sling-scripting-sightly version=${project.version}
 
bundlemvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.2/bundle
-
bundlemvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.6/bundle
+
bundlemvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.8/bundle
 !-- dependencies --
 feature