svn commit: r1799508 - /sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java

[sseifert]

Author: sseifert
Date: Wed Jun 21 20:06:10 2017
New Revision: 1799508

URL: http://svn.apache.org/viewvc?rev=1799508&view=rev
Log:
SLING-6976 ContentLoader.binaryFile() and ContentLoader.binaryResource() should 
try to derive mimetype from classpath resource rather than from target resource 
name

Modified:

sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java

Modified: 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java?rev=1799508&r1=1799507&r2=1799508&view=diff
==
--- 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
 (original)
+++ 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
 Wed Jun 21 20:06:10 2017
@@ -211,7 +211,7 @@ public final class ContentLoader {
 /**
  * Import binary file as nt:file binary node into repository. Auto-creates
  * parent hierarchies as nt:unstrucured nodes if missing. Mime type is
- * auto-detected from resource name.
+ * auto-detected from either {@code classpathResource} or {@code path}.
  * @param classpathResource Classpath resource URL for binary file.
  * @param path Path to mount binary data to (parent nodes created
  *automatically)
@@ -223,7 +223,7 @@ public final class ContentLoader {
 throw new IllegalArgumentException("Classpath resource not found: 
" + classpathResource);
 }
 try {
-return binaryFile(is, path, detectMimeTypeFromName(path));
+return binaryFile(is, path, 
detectMimeTypeFromNames(classpathResource, path));
 } finally {
 try {
 is.close();
@@ -268,7 +268,7 @@ public final class ContentLoader {
  * @return Resource with binary data
  */
 public Resource binaryFile(InputStream inputStream, String path) {
-return binaryFile(inputStream, path, detectMimeTypeFromName(path));
+return binaryFile(inputStream, path, detectMimeTypeFromNames(path));
 }
 
 /**
@@ -300,7 +300,7 @@ public final class ContentLoader {
  * @return Resource with binary data
  */
 public Resource binaryFile(InputStream inputStream, Resource 
parentResource, String name) {
-return binaryFile(inputStream, parentResource, name, 
detectMimeTypeFromName(name));
+return binaryFile(inputStream, parentResource, name, 
detectMimeTypeFromNames(name));
 }
 
 /**
@@ -332,7 +332,7 @@ public final class ContentLoader {
 /**
  * Import binary file as nt:resource binary node into repository.
  * Auto-creates parent hierarchies as nt:unstrucured nodes if missing. Mime
- * type is auto-detected from resource name.
+ * type is auto-detected from {@code classpathResource} or {@code path}.
  * @param classpathResource Classpath resource URL for binary file.
  * @param path Path to mount binary data to (parent nodes created
  *automatically)
@@ -344,7 +344,7 @@ public final class ContentLoader {
 throw new IllegalArgumentException("Classpath resource not found: 
" + classpathResource);
 }
 try {
-return binaryResource(is, path, detectMimeTypeFromName(path));
+return binaryResource(is, path, 
detectMimeTypeFromNames(classpathResource, path));
 } finally {
 try {
 is.close();
@@ -389,7 +389,7 @@ public final class ContentLoader {
  * @return Resource with binary data
  */
 public Resource binaryResource(InputStream inputStream, String path) {
-return binaryResource(inputStream, path, detectMimeTypeFromName(path));
+return binaryResource(inputStream, path, 
detectMimeTypeFromNames(path));
 }
 
 /**
@@ -421,7 +421,7 @@ public final class ContentLoader {
  * @return Resource with binary data
  */
 public Resource binaryResource(InputStream inputStream, Resource 
parentResource, String name) {
-return binaryResource(inputStream, parentResource, name, 
detectMimeTypeFromName(name));
+return binaryResource(inputStream, parentResource, name, 
detectMimeTypeFromNames(name));
 }
 
 /**
@@ -448,19 +448,22 @@ public final class ContentLoader {
 }
 
 /**
- * Detected mime type from name (file extension) using Mime Type service.
+ * Detected mime type from any of the given names (evaluating the file 
extension) using Mime Type service.
  * Fallback to application/octet-stream.
- * @param name Node name
+ * @param names The names from which to derive the mime type
  * @return Mime type (never null)
  */
-privat

svn commit: r1799509 - /sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java

[sseifert]

Author: sseifert
Date: Wed Jun 21 20:06:20 2017
New Revision: 1799509

URL: http://svn.apache.org/viewvc?rev=1799509&view=rev
Log:
SLING-6976 ContentLoader.binaryFile() and ContentLoader.binaryResource() should 
try to derive mimetype from classpath resource rather than from target resource 
name

Modified:

sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java

Modified: 
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
URL: 
http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java?rev=1799509&r1=1799508&r2=1799509&view=diff
==
--- 
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
 (original)
+++ 
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
 Wed Jun 21 20:06:20 2017
@@ -211,7 +211,7 @@ public final class ContentLoader {
 /**
  * Import binary file as nt:file binary node into repository. Auto-creates
  * parent hierarchies as nt:unstrucured nodes if missing. Mime type is
- * auto-detected from resource name.
+ * auto-detected from either {@code classpathResource} or {@code path}.
  * @param classpathResource Classpath resource URL for binary file.
  * @param path Path to mount binary data to (parent nodes created
  *automatically)
@@ -223,7 +223,7 @@ public final class ContentLoader {
 throw new IllegalArgumentException("Classpath resource not found: 
" + classpathResource);
 }
 try {
-return binaryFile(is, path, detectMimeTypeFromName(path));
+return binaryFile(is, path, 
detectMimeTypeFromNames(classpathResource, path));
 } finally {
 try {
 is.close();
@@ -268,7 +268,7 @@ public final class ContentLoader {
  * @return Resource with binary data
  */
 public Resource binaryFile(InputStream inputStream, String path) {
-return binaryFile(inputStream, path, detectMimeTypeFromName(path));
+return binaryFile(inputStream, path, detectMimeTypeFromNames(path));
 }
 
 /**
@@ -300,7 +300,7 @@ public final class ContentLoader {
  * @return Resource with binary data
  */
 public Resource binaryFile(InputStream inputStream, Resource 
parentResource, String name) {
-return binaryFile(inputStream, parentResource, name, 
detectMimeTypeFromName(name));
+return binaryFile(inputStream, parentResource, name, 
detectMimeTypeFromNames(name));
 }
 
 /**
@@ -332,7 +332,7 @@ public final class ContentLoader {
 /**
  * Import binary file as nt:resource binary node into repository.
  * Auto-creates parent hierarchies as nt:unstrucured nodes if missing. Mime
- * type is auto-detected from resource name.
+ * type is auto-detected from {@code classpathResource} or {@code path}.
  * @param classpathResource Classpath resource URL for binary file.
  * @param path Path to mount binary data to (parent nodes created
  *automatically)
@@ -344,7 +344,7 @@ public final class ContentLoader {
 throw new IllegalArgumentException("Classpath resource not found: 
" + classpathResource);
 }
 try {
-return binaryResource(is, path, detectMimeTypeFromName(path));
+return binaryResource(is, path, 
detectMimeTypeFromNames(classpathResource, path));
 } finally {
 try {
 is.close();
@@ -389,7 +389,7 @@ public final class ContentLoader {
  * @return Resource with binary data
  */
 public Resource binaryResource(InputStream inputStream, String path) {
-return binaryResource(inputStream, path, detectMimeTypeFromName(path));
+return binaryResource(inputStream, path, 
detectMimeTypeFromNames(path));
 }
 
 /**
@@ -421,7 +421,7 @@ public final class ContentLoader {
  * @return Resource with binary data
  */
 public Resource binaryResource(InputStream inputStream, Resource 
parentResource, String name) {
-return binaryResource(inputStream, parentResource, name, 
detectMimeTypeFromName(name));
+return binaryResource(inputStream, parentResource, name, 
detectMimeTypeFromNames(name));
 }
 
 /**
@@ -448,19 +448,22 @@ public final class ContentLoader {
 }
 
 /**
- * Detected mime type from name (file extension) using Mime Type service.
+ * Detected mime type from any of the given names (evaluating the file 
extension) using Mime Type service.
  * Fallback to application/octet-stream.
- * @param name Node name
+ * @param names The names from which to derive the mime type
  * @return Mime typ

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling Event 4.2.4 RCDeployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_121; Mac OS X 10.12.5)""userId" = "pauls""ip" = "193.104.215.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4.jar.asc(SHA1: 64fdd767f3d468d2465b8d67e27065103fa64935)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4-sources.jar(SHA1: 93e7987d6a8716e2bad85c559d1f1246aa8f5ea3)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4.jar(SHA1: 5fc269d191c5d84550e3813643168084bd7617f5)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4-source-release.zip(SHA1: c5e3369f60f20ff69dce545e95dc3233f31bb327)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4-source-release.zip.asc(SHA1: 7de575ba5fbcb5a3e5c13cb358854be9b21257fd)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4-javadoc.jar.asc(SHA1: 96cdf78724f9adc1abdd3d4d96a3d42bd4d9eb21)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4.pom(SHA1: 9a3e37b8c450de353567d48fec26924567c28a1b)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4.pom.asc(SHA1: a7386d284bbfd351475bd7a71c1ec6004d853af5)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4-javadoc.jar(SHA1: 24fe148ef540d062160e38543799391b3c184e04)/org/apache/sling/org.apache.sling.event/4.2.4/org.apache.sling.event-4.2.4-sources.jar.asc(SHA1: 345a597fd9659cf46f173e65d5d12313a0ded6f4)Action performed by Karl Pauls (pauls)

svn commit: r1799459 - /sling/trunk/bundles/extensions/event/resource/pom.xml

[pauls]

Author: pauls
Date: Wed Jun 21 14:36:28 2017
New Revision: 1799459

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

Modified:
sling/trunk/bundles/extensions/event/resource/pom.xml

Modified: sling/trunk/bundles/extensions/event/resource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/pom.xml?rev=1799459&r1=1799458&r2=1799459&view=diff
==
--- sling/trunk/bundles/extensions/event/resource/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/resource/pom.xml Wed Jun 21 14:36:28 
2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.event
 bundle
-4.2.4
+4.2.5-SNAPSHOT
 
 Apache Sling Event Support
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-4.2.4
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-4.2.4
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-4.2.4
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource
 
 
 

svn commit: r1799458 - /sling/tags/org.apache.sling.event-4.2.4/

[pauls]

Author: pauls
Date: Wed Jun 21 14:36:25 2017
New Revision: 1799458

URL: http://svn.apache.org/viewvc?rev=1799458&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.event-4.2.4

Added:
sling/tags/org.apache.sling.event-4.2.4/
  - copied from r1799457, sling/trunk/bundles/extensions/event/resource/

svn commit: r1799457 - /sling/trunk/bundles/extensions/event/resource/pom.xml

[pauls]

Author: pauls
Date: Wed Jun 21 14:36:11 2017
New Revision: 1799457

URL: http://svn.apache.org/viewvc?rev=1799457&view=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.event-4.2.4

Modified:
sling/trunk/bundles/extensions/event/resource/pom.xml

Modified: sling/trunk/bundles/extensions/event/resource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/pom.xml?rev=1799457&r1=1799456&r2=1799457&view=diff
==
--- sling/trunk/bundles/extensions/event/resource/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/resource/pom.xml Wed Jun 21 14:36:11 
2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.event
 bundle
-4.2.3-SNAPSHOT
+4.2.4
 
 Apache Sling Event Support
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-4.2.4
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-4.2.4
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-4.2.4
 
 
 

svn commit: r1799427 - in /sling/trunk/bundles/extensions/event/resource/src: main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMB

[pauls]

Author: pauls
Date: Wed Jun 21 11:19:32 2017
New Revision: 1799427

URL: http://svn.apache.org/viewvc?rev=1799427&view=rev
Log:
SLING-6975: Use the Statistics from the getStatistics() method of queues for 
jmx if the queue isn't an instanceof Statistics itself.

Modified:

sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java

sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java

Modified: 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java?rev=1799427&r1=1799426&r2=1799427&view=diff
==
--- 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java
 Wed Jun 21 11:19:32 2017
@@ -31,11 +31,8 @@ public class QueueMBeanImpl extends Abst
 
 public QueueMBeanImpl(Queue queue) {
 this.name = queue.getName();
-if (queue instanceof Statistics) {
-this.statistics = (Statistics) queue;
-} else {
-this.statistics = new EmptyStatistics();
-}
+Statistics stats = queue instanceof Statistics ? (Statistics) queue : 
queue.getStatistics();
+this.statistics = stats != null ? stats : new EmptyStatistics();
 }
 
 @Override

Modified: 
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java?rev=1799427&r1=1799426&r2=1799427&view=diff
==
--- 
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
 Wed Jun 21 11:19:32 2017
@@ -78,6 +78,22 @@ public class QueuesMBeanImplTest {
 testStatistics((StatisticsMBean) serviceObject.getValue());
 return queue;
 }
+
+@Test
+public void testAddQueueWithStatistics() {
+Queue queue = Mockito.mock(Queue.class);
+Statistics stats = Mockito.mock(Statistics.class);
+mockStatistics(stats);
+Mockito.when(queue.getStatistics()).thenReturn(stats);
+Mockito.when(queue.getName()).thenReturn("queue-name");
+Mockito.when(bundleContext.registerService(Mockito.anyString(), 
Mockito.any(StatisticsMBean.class), 
Mockito.any(Dictionary.class))).thenReturn(serviceRegistration);
+mbean.sendEvent(new QueueStatusEvent(queue,null));
+Mockito.verify(bundleContext, 
Mockito.only()).registerService(serviceClass.capture(), 
serviceObject.capture(), serviceProperties.capture());
+Assert.assertEquals("Expected bean to be registerd as a 
StatisticsMBean ", StatisticsMBean.class.getName(), serviceClass.getValue());
+Assert.assertTrue("Expected service to be an instance of 
SatisticsMBean", serviceObject.getValue() instanceof StatisticsMBean);
+Assert.assertNotNull("Expected properties to have a jmx.objectname", 
serviceProperties.getValue().get("jmx.objectname"));
+testStatistics((StatisticsMBean) serviceObject.getValue());
+}
 
 
 @Test

Jenkins build is back to stable : sling-contrib-extensions-distribution-it-1.8 #366

[Apache Jenkins Server]

See 

svn commit: r1799406 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

[tmaret]

Author: tmaret
Date: Wed Jun 21 09:03:42 2017
New Revision: 1799406

URL: http://svn.apache.org/viewvc?rev=1799406&view=rev
Log:
SLING-6969 - Support OAuth 2.0 server to server authentication in Distribution 
transport

* Add support for authorization header provided via the 
DistributionTransportSecret's credential map

Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java?rev=1799406&r1=1799405&r2=1799406&view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
 Wed Jun 21 09:03:42 2017
@@ -22,10 +22,12 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.InputStream;
 import java.net.URI;
+import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpHeaders;
 import org.apache.http.HttpHost;
 import org.apache.http.client.HttpResponseException;
 import org.apache.http.client.fluent.Executor;
@@ -33,6 +35,9 @@ import org.apache.http.client.fluent.Req
 import org.apache.http.client.fluent.Response;
 import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.entity.ContentType;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
 import org.apache.http.protocol.HTTP;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.distribution.DistributionRequest;
@@ -53,8 +58,24 @@ import org.apache.sling.distribution.uti
  */
 public class SimpleHttpDistributionTransport implements DistributionTransport {
 
+/**
+ * The key name of an entry holding a username associated to the #PASSWORD 
in
+ * the {@link DistributionTransportSecret}'s credentials map.
+ */
 private static final String USERNAME = "username";
+
+/**
+ * The key name of an entry holding a password associated to the #USERNAME 
in
+ * the {@link DistributionTransportSecret}'s credentials map.
+ */
 private static final String PASSWORD = "password";
+
+/**
+ * The key name of an entry holding an Authorization header in
+ * the {@link DistributionTransportSecret}'s credentials map.
+ */
+private static final String AUTHORIZATION = "authorization";
+
 private static final String EXECUTOR_CONTEXT_KEY_PREFIX = 
"ExecutorContextKey";
 
 /**
@@ -179,36 +200,50 @@ public class SimpleHttpDistributionTrans
 return null;
 }
 
-private Executor authenticate(DistributionTransportSecret secret, Executor 
executor) {
-Map credentialsMap = secret.asCredentialsMap();
-if (credentialsMap != null) {
-URI uri = distributionEndpoint.getUri();
-executor = executor.auth(new HttpHost(uri.getHost(), 
uri.getPort(), uri.getScheme()),
-credentialsMap.get(USERNAME), 
credentialsMap.get(PASSWORD)).authPreemptive(
-new HttpHost(uri.getHost(), uri.getPort(), 
uri.getScheme()));
-log.debug("authenticate user={}, endpoint={}", 
secret.asCredentialsMap().get(USERNAME), distributionEndpoint.getUri());
-}
-return executor;
-}
-
 private String getHostAndPort(URI uri) {
 return uri.getHost() + ":" + uri.getPort();
 }
 
 
 private Executor getExecutor(DistributionTransportContext 
distributionContext) {
-if (distributionContext.containsKey(contextKeyExecutor)) {
-return distributionContext.get(contextKeyExecutor, Executor.class);
+Executor executor = distributionContext.get(contextKeyExecutor, 
Executor.class);
+if (executor == null) {
+executor = buildExecutor();
+distributionContext.put(contextKeyExecutor, executor);
 }
+return executor;
+}
 
-Executor executor = Executor.newInstance();
+private Executor buildAuthExecutor(String username, String password) {
+URI uri = distributionEndpoint.getUri();
+Executor executor = Executor.newInstance()
+.auth(new HttpHost(uri.getHost(), uri.getPort(), 
uri.getScheme()), username, password)
+.authPreemptive(new HttpHost(uri.getHost(), uri.getPort(), 
uri.getScheme()));
+ 

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

[sseifert]

Author: sseifert
Date: Wed Jun 21 08:02:06 2017
New Revision: 1014316

Log:
Publishing svnmucc operation to sling site by sseifert

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

svn commit: r1014315 - in /websites/staging/sling/trunk/content: ./ documentation/the-sling-engine/architecture.html

[buildbot]

Author: buildbot
Date: Wed Jun 21 08:01:43 2017
New Revision: 1014315

Log:
Staging update by buildbot for sling

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

websites/staging/sling/trunk/content/documentation/the-sling-engine/architecture.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 21 08:01:43 2017
@@ -1 +1 @@
-1799395
+1799397

Modified: 
websites/staging/sling/trunk/content/documentation/the-sling-engine/architecture.html
==
--- 
websites/staging/sling/trunk/content/documentation/the-sling-engine/architecture.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/the-sling-engine/architecture.html
 Wed Jun 21 08:01:43 2017
@@ -126,7 +126,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 The following sections elaborate on each of these highlights.
 OSGi¶
-http://www.osgi.org";>OSGi is a consortium that has developed a 
specification to build modular and extensible applications. This offers http://www.osgi.org/About/WhyOSGi";>various benefits. We deal mainly 
with two parts of the specifications: The Core Specification, which defines the 
OSGi Framework and Core Services, and the Compendium Services Specification, 
which defines a host of services that extend the functionality of the OSGi 
Framework.
+http://www.osgi.org";>OSGi is a consortium that has developed a 
specification to build modular and extensible applications. This offers https://www.osgi.org/developer/benefits-of-using-osgi/";>various 
benefits. We deal mainly with two parts of the specifications: The Core 
Specification, which defines the OSGi Framework and Core Services, and the 
Compendium Services Specification, which defines a host of services that extend 
the functionality of the OSGi Framework.
 OSGi Framework¶
 The OSGi Framework is made up of three layers – Module, Lifecycle, 
and Services – that define how extensible applications are built and 
deployed. The responsibilities of the layers are:
 
@@ -170,7 +170,7 @@ h2:hover > .headerlink, h3:hover > .head
 Optionally, PAX Web's implementation of HttpService can be used when Sling 
is launched as a standalone Java Application. See the Maven Launchpad 
Plugin page for information on how to do this.
 See The 
Sling Launchpad for more information.
   
-Rev. 1500501 by fmeschbe on Sun, 7 Jul 2013 18:49:51 +
+Rev. 1799397 by sseifert on Wed, 21 Jun 2017 08:01:21 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

svn commit: r1799397 - /sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext

[sseifert]

Author: sseifert
Date: Wed Jun 21 08:01:21 2017
New Revision: 1799397

URL: http://svn.apache.org/viewvc?rev=1799397&view=rev
Log:
SLING-6971 fix link to osgi website

Modified:
sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext

Modified: 
sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext?rev=1799397&r1=1799396&r2=1799397&view=diff
==
--- sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext 
(original)
+++ sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext 
Wed Jun 21 08:01:21 2017
@@ -13,7 +13,7 @@ The following sections elaborate on each
 
 ## OSGi
 
-[OSGi](http://www.osgi.org) is a consortium that has developed a specification 
to build modular and extensible applications. This offers [various 
benefits](http://www.osgi.org/About/WhyOSGi). We deal mainly with two parts of 
the specifications: The Core Specification, which defines the OSGi Framework 
and Core Services, and the Compendium Services Specification, which defines a 
host of services that extend the functionality of the OSGi Framework.
+[OSGi](http://www.osgi.org) is a consortium that has developed a specification 
to build modular and extensible applications. This offers [various 
benefits](https://www.osgi.org/developer/benefits-of-using-osgi/). We deal 
mainly with two parts of the specifications: The Core Specification, which 
defines the OSGi Framework and Core Services, and the Compendium Services 
Specification, which defines a host of services that extend the functionality 
of the OSGi Framework.
 
 ### OSGi Framework
 

[5/5] sling-site git commit: DRAFT warning added

[bdelacretaz]

DRAFT warning added


Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/6d76e929
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/6d76e929
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/6d76e929

Branch: refs/heads/asf-site
Commit: 6d76e929fefb8cbc9579abff82586c02d2eaeadf
Parents: b033d3d
Author: Bertrand Delacretaz 
Authored: Wed Jun 21 09:32:20 2017 +0200
Committer: Bertrand Delacretaz 
Committed: Wed Jun 21 09:32:20 2017 +0200

--
 archive.html| 2 +-
 contributing.html   | 2 +-
 documentation.html  | 2 +-
 documentation/bundles.html  | 2 +-
 .../accessing-filesystem-resources-extensions-fsresource.html   | 2 +-
 documentation/bundles/apache-sling-commons-thread-pool.html | 2 +-
 .../bundles/apache-sling-eventing-and-job-handling.html | 2 +-
 .../bundles/bundle-resources-extensions-bundleresource.html | 2 +-
 documentation/bundles/caching-services.html | 2 +-
 documentation/bundles/commons-html-utilities.html   | 2 +-
 documentation/bundles/configuration-installer-factory.html  | 2 +-
 documentation/bundles/content-distribution.html | 2 +-
 documentation/bundles/content-loading-jcr-contentloader.html| 2 +-
 .../context-aware-configuration-default-implementation.html | 2 +-
 .../context-aware-configuration-override.html   | 2 +-
 .../context-aware-configuration-spi.html| 2 +-
 .../context-aware-configuration.html| 2 +-
 documentation/bundles/datasource-providers.html | 2 +-
 documentation/bundles/discovery-api-and-impl.html   | 2 +-
 documentation/bundles/dynamic-includes.html | 2 +-
 documentation/bundles/file-installer-provider.html  | 2 +-
 documentation/bundles/internationalization-support-i18n.html| 2 +-
 documentation/bundles/jcr-installer-provider.html   | 2 +-
 documentation/bundles/log-tracers.html  | 2 +-
 .../bundles/managing-permissions-jackrabbit-accessmanager.html  | 2 +-
 .../managing-users-and-groups-jackrabbit-usermanager.html   | 2 +-
 ...manipulating-content-the-slingpostservlet-servlets-post.html | 2 +-
 documentation/bundles/metrics.html  | 2 +-
 documentation/bundles/mime-type-support-commons-mime.html   | 2 +-
 documentation/bundles/models.html   | 2 +-
 documentation/bundles/nosql-resource-providers.html | 2 +-
 documentation/bundles/org-apache-sling-junit-bundles.html   | 2 +-
 documentation/bundles/osgi-installer.html   | 2 +-
 .../output-rewriting-pipelines-org-apache-sling-rewriter.html   | 2 +-
 .../bundles/rendering-content-default-get-servlets.html | 2 +-
 documentation/bundles/repository-initialization.html| 2 +-
 documentation/bundles/request-analysis.html | 2 +-
 documentation/bundles/resource-access-security.html | 2 +-
 documentation/bundles/resource-editor.html  | 2 +-
 documentation/bundles/resource-merger.html  | 2 +-
 documentation/bundles/scheduler-service-commons-scheduler.html  | 2 +-
 documentation/bundles/scripting.html| 2 +-
 documentation/bundles/scripting/scripting-htl.html  | 2 +-
 documentation/bundles/scripting/scripting-jsp.html  | 2 +-
 documentation/bundles/scripting/scripting-thymeleaf.html| 2 +-
 documentation/bundles/servlet-helpers.html  | 2 +-
 documentation/bundles/sling-health-check-tool.html  | 2 +-
 documentation/bundles/sling-oak-restrictions.html   | 2 +-
 documentation/bundles/sling-pipes.html  | 2 +-
 documentation/bundles/sling-query.html  | 2 +-
 .../bundles/sling-settings-org-apache-sling-settings.html   | 2 +-
 documentation/bundles/subsystem-installer-factory.html  | 2 +-
 documentation/bundles/validation.html   | 2 +-
 documentation/bundles/web-console-extensions.html   | 2 +-
 documentation/bundles/xml-support.html  | 2 +-
 documentation/configuration.html| 2 +-
 documentation/development.html  | 2 +-
 documentation/development/client-request-logging.html   | 2 +-
 documentation/development/dependency-management.html| 2 +-
 documentation/development/embedding-sling.html  | 2 +-
 documentation/development/getting-and-building-sling.html   | 2

[1/5] sling-site git commit: DRAFT warning added

[bdelacretaz]

Repository: sling-site
Updated Branches:
  refs/heads/asf-site b033d3d71 -> 6d76e929f


http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
--
diff --git a/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html 
b/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
index e633722..937ff8a 100644
--- a/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
+++ b/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
--
diff --git 
a/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html 
b/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
index ea04f52..7588fd9 100644
--- a/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
+++ b/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/tutorials-how-tos/jackrabbit-persistence.html
--
diff --git a/documentation/tutorials-how-tos/jackrabbit-persistence.html 
b/documentation/tutorials-how-tos/jackrabbit-persistence.html
index ffdf210..83c2dc7 100644
--- a/documentation/tutorials-how-tos/jackrabbit-persistence.html
+++ b/documentation/tutorials-how-tos/jackrabbit-persistence.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/

[3/5] sling-site git commit: DRAFT warning added

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/development/client-request-logging.html
--
diff --git a/documentation/development/client-request-logging.html 
b/documentation/development/client-request-logging.html
index c076619..e0a679d 100644
--- a/documentation/development/client-request-logging.html
+++ b/documentation/development/client-request-logging.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/development/dependency-management.html
--
diff --git a/documentation/development/dependency-management.html 
b/documentation/development/dependency-management.html
index eff6bbb..31c67ee 100644
--- a/documentation/development/dependency-management.html
+++ b/documentation/development/dependency-management.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/development/embedding-sling.html
--
diff --git a/documentation/development/embedding-sling.html 
b/documentation/development/embedding-sling.html
index 01bdca6..48204f1 100644
--- a/documentation/development/embedding-sling.html
+++ b/documentation/development/embedding-sling.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.o

[4/5] sling-site git commit: DRAFT warning added

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
--
diff --git 
a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
 
b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
index 8cb6cce..fb509bf 100644
--- 
a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
+++ 
b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/bundles/metrics.html
--
diff --git a/documentation/bundles/metrics.html 
b/documentation/bundles/metrics.html
index 4c8a3c3..95a9813 100644
--- a/documentation/bundles/metrics.html
+++ b/documentation/bundles/metrics.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/bundles/mime-type-support-commons-mime.html
--
diff --git a/documentation/bundles/mime-type-support-commons-mime.html 
b/documentation/bundles/mime-type-support-commons-mime.html
index 0f5ede6..bf30802 100644
--- a/documentation/bundles/mime-type-support-commons-mime.html
+++ b/documentation/bundles/mime-type-support-commons-mime.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apac

[2/5] sling-site git commit: DRAFT warning added

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/the-sling-engine.html
--
diff --git a/documentation/the-sling-engine.html 
b/documentation/the-sling-engine.html
index 2275340..724a09b 100644
--- a/documentation/the-sling-engine.html
+++ b/documentation/the-sling-engine.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/the-sling-engine/adapters.html
--
diff --git a/documentation/the-sling-engine/adapters.html 
b/documentation/the-sling-engine/adapters.html
index c195e06..5a83d3a 100644
--- a/documentation/the-sling-engine/adapters.html
+++ b/documentation/the-sling-engine/adapters.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/the-sling-engine/architecture.html
--
diff --git a/documentation/the-sling-engine/architecture.html 
b/documentation/the-sling-engine/architecture.html
index 6f24cc9..21c25ce 100644
--- a/documentation/the-sling-engine/architecture.html
+++ b/documentation/the-sling-engine/architecture.html
@@ -14,7 +14,7 @@
 
 
 
-
+DRAFT 2017 WEBSITE - SLING-6955
 
 
 DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map

http://git-wip-us.apache.org/repos/asf/sling-site/blob/6d76e929/documentation/the-sling-engine/authentication.html
---

sling-site git commit: DRAFT warning

[bdelacretaz]

Repository: sling-site
Updated Branches:
  refs/heads/master 545a6e22d -> 9ea2122d3


DRAFT warning


Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/9ea2122d
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/9ea2122d
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/9ea2122d

Branch: refs/heads/master
Commit: 9ea2122d3a95c3b215f9bec832fb3667d36f322c
Parents: 545a6e2
Author: Bertrand Delacretaz 
Authored: Wed Jun 21 09:30:17 2017 +0200
Committer: Bertrand Delacretaz 
Committed: Wed Jun 21 09:30:17 2017 +0200

--
 assets/res/css/site.css | 5 +
 templates/header.tpl| 1 +
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/sling-site/blob/9ea2122d/assets/res/css/site.css
--
diff --git a/assets/res/css/site.css b/assets/res/css/site.css
index 28c8908..92916f6 100644
--- a/assets/res/css/site.css
+++ b/assets/res/css/site.css
@@ -271,3 +271,8 @@ pre {
 padding: 0.5em
 width: 100%;
 }
+
+.draft {
+color:blue;
+text-align:center;
+}

http://git-wip-us.apache.org/repos/asf/sling-site/blob/9ea2122d/templates/header.tpl
--
diff --git a/templates/header.tpl b/templates/header.tpl
index b5a84b1..098266c 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -19,3 +19,4 @@ div(class:"title") {
  }
   }
 }
+h1(class:"draft") { yield "DRAFT 2017 WEBSITE - SLING-6955" }

[14/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/servlet-helpers.html
--
diff --git a/documentation/bundles/servlet-helpers.html 
b/documentation/bundles/servlet-helpers.html
index 1afcb14..b9dcbe0 100644
--- a/documentation/bundles/servlet-helpers.html
+++ b/documentation/bundles/servlet-helpers.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Sling Servlet HelpersThe Sling 
Servlet Helpers bundle provides mock implementations of the 
SlingHttpServletRequest, SlingHttpServletResponse and 
related classes.
 Those mock implementations are meant to be used in tests and also with 
services like the SlingRequestProcessor when making requests to 
that service outside of an HTTP request processing context.
@@ -25,26 +25,65 @@
 Usage
 SlingHttpServletRequest
 Example for preparing a sling request with custom request data:
-!java
-// prepare sling request MockSlingHttpServletRequest request = new 
MockSlingHttpServletRequest(resourceResolver);
-// simulate query string 
request.setQueryString("param1=aaa¶m2=bbb");
-// alternative - set query parameters as map 
request.setParameterMap(ImmutableMap.builder() 
.put("param1", "aaa") .put("param2", "bbb") .build());
-// set current resource 
request.setResource(resourceResolver.getResource("/content/sample"));
-// set sling request path info properties MockRequestPathInfo 
requestPathInfo = (MockRequestPathInfo)request.getRequestPathInfo(); 
requestPathInfo.setSelectorString("selector1.selector2"); 
requestPathInfo.setExtension("html");
-// set method request.setMethod(HttpConstants.METHOD_POST);
-// set attributes request.setAttribute("attr1", "value1");
-// set headers request.addHeader("header1", "value1");
-// set cookies request.addCookie(new Cookie("cookie1", "value1"));
+#!java
+// prepare sling request
+MockSlingHttpServletRequest request = new 
MockSlingHttpServletRequest(resourceResolver);
+
+// simulate query string
+request.setQueryString("param1=aaa¶m2=bbb");
+
+// alternative - set query parameters as map
+request.setParameterMap(ImmutableMap.builder()
+.put("param1", "aaa")
+.put("param2", "bbb")
+.build());
+
+// set current resource
+request.setResource(resourceResolver.getResource("/content/sample"));
+
+// set sling request path info properties
+MockRequestPathInfo requestPathInfo = 
(MockRequestPathInfo)request.getRequestPathInfo();
+requestPathInfo.setSelectorString("selector1.selector2");
+requestPathInfo.setExtension("html");
+
+// set method
+request.setMethod(HttpConstants.METHOD_POST);
+
+// set attributes
+request.setAttribute("attr1", "value1");
+
+// set headers
+request.addHeader("header1", "v

[13/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/subsystem-installer-factory.html
--
diff --git a/documentation/bundles/subsystem-installer-factory.html 
b/documentation/bundles/subsystem-installer-factory.html
index 777a35e..9c84480 100644
--- a/documentation/bundles/subsystem-installer-factory.html
+++ b/documentation/bundles/subsystem-installer-factory.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Subsystems Installer FactoryThe 
subsystems installer factory provides support for subsystems to the OSGI installer. The 
provisioning of artifacts is handled by installer providers like the file 
installer or the JCR installer.
 Subsystems

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/validation.html
--
diff --git a/documentation/bundles/validation.html 
b/documentation/bundles/validation.html
index 3684e21..c196983 100644
--- a/documentation/bundles/validation.html
+++ b/documentation/bundles/validation.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/pr

[07/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/the-sling-engine/authentication/authentication-actors.html
--
diff --git 
a/documentation/the-sling-engine/authentication/authentication-actors.html 
b/documentation/the-sling-engine/authentication/authentication-actors.html
index cec16a4..1cb8cab 100644
--- a/documentation/the-sling-engine/authentication/authentication-actors.html
+++ b/documentation/the-sling-engine/authentication/authentication-actors.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Authentication - ActorsExcerpt: The 
authentication process involves a number of actors contributing to the 
concepts, the API and the particular implementations.
 The authentication process involves a number of actors contributing to the 
concepts, the API and the particular implementations.

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
--
diff --git 
a/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
 
b/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
index 8ab1b7d..bf83cf8 100644
--- 
a/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
+++ 
b/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+Documentat

[22/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup


Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/3a935d04
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/3a935d04
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/3a935d04

Branch: refs/heads/asf-site
Commit: 3a935d04199f90e82c2c89749ec764d91357245a
Parents: c1fb7b2
Author: Bertrand Delacretaz 
Authored: Wed Jun 21 09:21:20 2017 +0200
Committer: Bertrand Delacretaz 
Committed: Wed Jun 21 09:21:20 2017 +0200

--
 archive.html|  10 +-
 contributing.html   |  10 +-
 documentation.html  |  72 ++-
 documentation/bundles.html  |  10 +-
 ...esystem-resources-extensions-fsresource.html |  25 +-
 .../apache-sling-commons-thread-pool.html   |  10 +-
 .../apache-sling-eventing-and-job-handling.html |  79 ++-
 ...dle-resources-extensions-bundleresource.html |  25 +-
 documentation/bundles/caching-services.html |  10 +-
 .../bundles/commons-html-utilities.html |  10 +-
 .../configuration-installer-factory.html|  42 +-
 documentation/bundles/content-distribution.html | 201 +---
 .../content-loading-jcr-contentloader.html  | 213 +---
 ...re-configuration-default-implementation.html |  19 +-
 .../context-aware-configuration-override.html   |  30 +-
 .../context-aware-configuration-spi.html|  10 +-
 .../context-aware-configuration.html| 115 +++--
 documentation/bundles/datasource-providers.html |  45 +-
 .../bundles/discovery-api-and-impl.html |  81 +++-
 documentation/bundles/dynamic-includes.html |  12 +-
 .../bundles/file-installer-provider.html|  12 +-
 .../internationalization-support-i18n.html  |  67 ++-
 .../bundles/jcr-installer-provider.html |  67 ++-
 documentation/bundles/log-tracers.html  | 174 +--
 ...ng-permissions-jackrabbit-accessmanager.html |  26 +-
 ...users-and-groups-jackrabbit-usermanager.html | 121 -
 ...tent-the-slingpostservlet-servlets-post.html | 293 ++-
 documentation/bundles/metrics.html  |  72 ++-
 .../bundles/mime-type-support-commons-mime.html |  12 +-
 documentation/bundles/models.html   | 304 +---
 .../bundles/nosql-resource-providers.html   |  28 +-
 .../bundles/org-apache-sling-junit-bundles.html | 191 ++--
 documentation/bundles/osgi-installer.html   |  10 +-
 ...ing-pipelines-org-apache-sling-rewriter.html |  31 +-
 .../rendering-content-default-get-servlets.html |  14 +-
 .../bundles/repository-initialization.html  | 124 +++--
 documentation/bundles/request-analysis.html |  13 +-
 .../bundles/resource-access-security.html   |  42 +-
 documentation/bundles/resource-editor.html  |  12 +-
 documentation/bundles/resource-merger.html  |  93 +++-
 .../scheduler-service-commons-scheduler.html| 192 ++--
 documentation/bundles/scripting.html|  15 +-
 .../bundles/scripting/scripting-htl.html| 465 +-
 .../bundles/scripting/scripting-jsp.html| 299 +++-
 .../bundles/scripting/scripting-thymeleaf.html  |  19 +-
 documentation/bundles/servlet-helpers.html  |  85 +++-
 .../bundles/sling-health-check-tool.html|  85 +++-
 .../bundles/sling-oak-restrictions.html | 125 +++--
 documentation/bundles/sling-pipes.html  | 172 ++-
 documentation/bundles/sling-query.html  |  48 +-
 ...ling-settings-org-apache-sling-settings.html |  30 +-
 .../bundles/subsystem-installer-factory.html|  10 +-
 documentation/bundles/validation.html   |  76 ++-
 .../bundles/web-console-extensions.html |  10 +-
 documentation/bundles/xml-support.html  |  10 +-
 documentation/configuration.html|  41 +-
 documentation/development.html  |  10 +-
 .../development/client-request-logging.html |  49 +-
 .../development/dependency-management.html  |  10 +-
 documentation/development/embedding-sling.html  |  21 +-
 .../development/getting-and-building-sling.html |  66 ++-
 documentation/development/hamcrest.html |  41 +-
 documentation/development/htl-maven-plugin.html |  10 +-
 documentation/development/ide-tooling.html  |  13 +-
 .../ide-tooling-incremental-build.html  |  10 +-
 documentation/development/issue-tracker.html|  10 +-
 documentation/development/jcr-mock.html |  42 +-
 documentation/development/jspc.html |  10 +-
 documentation/development/jsr-305.html  |  57 ++-
 documentation/development/logging.html  | 249 --
 documentation/development/maven-archetypes.html |  10 +-
 .../development/maven-launchpad-plugin.html |  88 +++-
 documentation/development/maven-us

[09/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/development/sling-mock.html
--
diff --git a/documentation/development/sling-mock.html 
b/documentation/development/sling-mock.html
index 7b8c1f9..87afbf8 100644
--- a/documentation/development/sling-mock.html
+++ b/documentation/development/sling-mock.html
@@ -2,28 +2,32 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Sling MocksMock implementation of 
selected Sling APIs for easier testing.
 [TOC]
 Maven Dependency
-!xml
- org.apache.sling 
org.apache.sling.testing.sling-mock 
+#!xml
+
+  org.apache.sling
+  org.apache.sling.testing.sling-mock
+
+
 See latest version on the downloads page.
 There are two major version ranges available:
 
@@ -33,41 +37,65 @@
 Implemented mock features
 The mock implementation supports:
 
-  ResourceResolver implementation for reading and writing 
resource data using the Sling Resource API
-  Backed by a mocked or real Jackrabbit 
JCR implementation
-  Uses the productive http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource";>Sling 
JCR resource provider implementation internally to do the Resource-JCR 
mapping
-  Alternatively the non-JCR mock implementation provided by the Sling 
resourceresolver-mock implementation can be used
-  AdapterManager implementation for registering adapter 
factories and resolving adaptions
-  The implementation is thread-safe so it can be used in parallel running 
unit tests
-  SlingScriptHelper implementation providing access to mocked 
request/response objects and supports getting OSGi services from the mocked OSGi 
environment.
-  Implementations of the servlet-related Sling API classes like 
SlingHttpServletRequest and 
SlingHttpServletRequest
-  It is possible to set request data to simulate a certain Sling HTTP 
request
+  ResourceResolver implementation for reading and writing 
resource data using the Sling Resource API
+
+  Backed by a mocked or real Jackrabbit 
JCR implementation
+  Uses the productive http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource";>Sling 
JCR resource provider implementation internally to do the Resource-JCR 
mapping
+  Alternatively the non-JCR mock implementation provided by the  Sling 
resourceresolver-mock implementation can be used
+
+  
+  AdapterManager implementation for registering adapter 
factories and resolving adaptions
+
+  The implementation is thread-safe so it can be used in parallel 
running unit tests
+
+  
+  SlingScriptHelper implementation providing access to mocked 
request/response objects and supports getting  OSGi services from the mocked OSGi

[01/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

Repository: sling-site
Updated Branches:
  refs/heads/asf-site c1fb7b2cf -> b033d3d71


http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/sitemap.xml
--
diff --git a/sitemap.xml b/sitemap.xml
index 1e40867..3701538 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,290 +1,286 @@
 
 http://www.sitemaps.org/schemas/sitemap/0.9"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 
http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd";>
 
-
http://localhost/documentation/the-sling-engine/url-to-script-resolution.html2017-06-14
+
http://sling.apache.org/ng/contributing.html2017-06-21
 
-
http://localhost/documentation/the-sling-engine/wrap-or-decorate-resources.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html2017-06-21
 
-
http://localhost/documentation/the-sling-engine.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/apache-sling-commons-thread-pool.html2017-06-21
 
-
http://localhost/documentation/tutorials-how-tos/46-line-blog.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/apache-sling-eventing-and-job-handling.html2017-06-21
 
-
http://localhost/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/bundle-resources-extensions-bundleresource.html2017-06-21
 
-
http://localhost/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/caching-services.html2017-06-21
 
-
http://localhost/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/commons-html-utilities.html2017-06-21
 
-
http://localhost/documentation/tutorials-how-tos/jackrabbit-persistence.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/configuration-installer-factory.html2017-06-21
 
-
http://localhost/documentation/tutorials-how-tos/testing-sling-based-applications.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/content-distribution.html2017-06-21
 
-
http://localhost/documentation/tutorials-how-tos.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/content-loading-jcr-contentloader.html2017-06-21
 
-
http://localhost/documentation.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html2017-06-21
 
-
http://localhost/errors/403.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-override.html2017-06-21
 
-
http://localhost/errors/404.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html2017-06-21
 
-http://localhost/guides.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/context-aware-configuration/context-aware-configuration.html2017-06-21
 
-http://localhost/index.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/datasource-providers.html2017-06-21
 
-
http://localhost/javadoc-io.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/discovery-api-and-impl.html2017-06-21
 
-http://localhost/links.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/dynamic-includes.html2017-06-21
 
-http://localhost/media.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/file-installer-provider.html2017-06-21
 
-
http://localhost/news/sling-ide-tooling-11-released.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/internationalization-support-i18n.html2017-06-21
 
-
http://localhost/news/sling-launchpad-8-released.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/jcr-installer-provider.html2017-06-21
 
-
http://localhost/news/sling-launchpad-9-released.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/log-tracers.html2017-06-21
 
-http://localhost/news.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html2017-06-21
 
-http://localhost/old-stuff.html2017-06-14
+
http://sling.apache.org/ng/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html2017-06-21
 
-http://localhost/plugins.html2017-06-14
+
http://sling.apache.

[03/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 2750e8c..ceb311c 100644
--- a/downloads.html
+++ b/downloads.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 DownloadsTo get the latest 
development release of Apache Sling, you can check out the Source Code and 
Getting and Building Sling yourself. Otherwise, the releases below are 
available for download. To install, just download and extract. The PGP keys at 
https://people.apache.org/keys/group/sling.asc
 can be used to verify the integrity of the release archives.
 All Apache Sling products are distributed under the terms of The Apache 
Software License (version 2.0). See our license, or the LICENSE file included 
in each distribution. 
@@ -38,12 +38,11 @@
 [for backup][backup] (backup)[end]
 [end]
 
-
-Sling Application
+Sling Application
 
 
ArtifactVersionProvidesPackage
 
-Sling Standalone 
Application9A self-runnable Sling jarorg.apache.sling.launchpad-9.jar
 (http://www.apache.org/dist/sling/org.apache.sling.launchpad-9.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad-9.jar.md5";>md5)Sling
 Web Application9A ready-to run Sling webapp as a war 
fileorg.apache.sling.launchpad-9.jarorg.apache.sling.launchpad-9-webapp.war
 (http://www.apache.org/dist/sling/org.apache.sling.launchpad-9-webapp.war.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad-9-webapp.war.md5";>md5)Sling
 Source Release9The released Sling source 
codeorg.apache.sling.launchpad-9-weba
 pp.warorg.apache.sling.launchpad-9-source-release.zip
 (http://www.apache.org/dist/sling/org.apache.sling.launchpad-9-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad-9-source-release.zip.md5";>md5)Sling
 IDE Tooling
+Sling Standalone 
Application9A self-runnable Sling jarorg.apache.sling.launchpad-9.jar
 (http://www.apache.org/dist/sling/org.apache.sling.launchpad-9.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad-9.jar.md5";>md5)Sling
 Web Application9A ready-to run Sling webapp as a war 
fileorg.apache.sling.launchpad-9-webapp.war
 (http://www.apache.org/dist/sling/org.apache.sling.launchpad-9-webapp.war.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad-9-webapp.war.md5";>md5)Sling
 Source Release9The released Sling source codeorg.apac
 he.sling.launchpad-9-source-release.zip (http://www.apache.org/dist/sling/org.apache.sling.launchpad-9-source-release.zip.asc";>as

[05/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/the-sling-engine/servlets.html
--
diff --git a/documentation/the-sling-engine/servlets.html 
b/documentation/the-sling-engine/servlets.html
index 0e50baf..7855bbc 100644
--- a/documentation/the-sling-engine/servlets.html
+++ b/documentation/the-sling-engine/servlets.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Servlets and Scripts[TOC]
 See also URL to 
Script Resolution which explains how Sling maps URLs to a script or and 
servlet.
@@ -59,7 +59,7 @@
 
 A SlingServletResolver listens for Servlet 
services and - given the correct service registration properties - provides the 
servlets as resources in the (virtual) resource tree. Such servlets are 
provided as ServletResource instances which adapt to the 
javax.servlet.Servlet class.
 For a Servlet registered as an OSGi service to be used by the Sling Servlet 
Resolver, either one or both of the sling.servlet.paths or the 
sling.servlet.resourceTypes service reference properties must be 
set. If neither is set, the Servlet service is ignored.
-Each path to be used for registration - either from the 
sling.servlet.paths property or constructed from the other 
sling.servlet.* properties - must be absolute. Any relative path 
is made absolute by prefixing it with a root path. This prefix may be set with 
the sling.servlet.prefix service registration property. If this 
property is not set, the first entry in the ResourceResolver 
search path for the ResourceResolver.getResource(String) method is 
used as the prefix. If this entry cannot be derived, a simpe slash - 
/ - is used as the prefix.
+Each path to be used for registration - either from the 
sling.servlet.paths property or constructed from the other 
sling.servlet.\* properties - must be absolute. Any relative path 
is made absolute by prefixing it with a root path. This prefix may be set with 
the sling.servlet.prefix service registration property. If this 
property is not set, the first entry in the ResourceResolver 
search path for the ResourceResolver.getResource(String) method is 
used as the prefix. If this entry cannot be derived, a simpe slash - 
/ - is used as the prefix.
 If sling.servlet.methods is not specified, the servlet is only 
registered for handling GET and HEAD requests. Make sure to list all methods 
you want to be handled by this servlet.
 Caveats when binding servlets by path
 Binding servlets by paths has several disadvantages when compared to 
binding by resource types, namely:
@@ -69,31 +69,64 @@
   if a path-bound servlet is not active, e.g. if the bundle is missing or 
not started, a POST might result in unexpected results. usually cr

[11/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/development/logging.html
--
diff --git a/documentation/development/logging.html 
b/documentation/development/logging.html
index 6b87cbf..be60c38 100644
--- a/documentation/development/logging.html
+++ b/documentation/development/logging.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Logging
 This document is for the new (November 2013) 4.x release of the Sling Commons 
Log components. Refer to
@@ -61,9 +61,12 @@ 
http://localhost:8080/system/console/slinglog/tailer.txt?tail=1000&grep=luce
 
   name - Appender name like /logs/error.log
   tail - Number of lines to include in dump. -1 to include 
whole file
-  grep - Filter the log lines based on grep 
value which can be
-  Simple string phrase - In this case search is done in case insensitive 
way via String.contains
-  regex - In this case the search would be done via regex pattern 
matching
+  grep - Filter the log lines based on grep 
value which can be
+
+  Simple string phrase - In this case search is done in case 
insensitive way via String.contains
+  regex - In this case the search would be done via regex pattern 
matching
+
+  
 
 Initial Configuration
 The org.apache.sling.commons.log bundle gets its initial 
configuration from the following BundleContext properties:
@@ -98,7 +101,7 @@ 
http://localhost:8080/system/console/slinglog/tailer.txt?tail=1000&grep=luce
 
 
   org.apache.sling.commons.log.pattern 
-  {0,date,dd.MM. HH:mm:ss.SSS} {4} [{2}]({{ refs.-2.path 
}}) {3} {5} 
+  {0,date,dd.MM. HH:mm:ss.SSS} *{4}* [{2}]({{ refs.-2.path }}) {3} 
{5} 
   The MessageFormat pattern to use for formatting log 
messages with the root logger. 
 
 
@@ -163,12 +166,12 @@ 
http://localhost:8080/system/console/slinglog/tailer.txt?tail=1000&grep=luce
 
   org.apache.sling.commons.log.pattern 
   String 
-  {0,date,dd.MM. HH:mm:ss.SSS} {4} [{2}]({{ refs.-2.path 
}}) {3} {5} 
+  {0,date,dd.MM. HH:mm:ss.SSS} *{4}* [{2}]({{ refs.-2.path }}) {3} 
{5} 
   The java.util.MessageFormat pattern to use for 
formatting log messages with the root logger. This is a 
java.util.MessageFormat pattern supporting up to six arguments: 
{0} The timestamp of type java.util.Date, {1} the log marker, {2} 
the name of the current thread, {3} the name of the logger, {4} the log level 
and {5} the actual log message. If the log call includes a Throwable, the 
stacktrace is just appended to the message regardless of the pattern. 
 
   
 
-| org.apache.sling.commons.log.names | String[] | 
-- | A list of logger names to which this configuration applies. | | 

[17/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/models.html
--
diff --git a/documentation/bundles/models.html 
b/documentation/bundles/models.html
index 9245ecd..f2cbf08 100644
--- a/documentation/bundles/models.html
+++ b/documentation/bundles/models.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Sling Models[TOC]
 Many Sling projects want to be able to create model objects - POJOs which 
are automatically mapped from Sling objects, typically resources, but also 
request objects. Sometimes these POJOs need OSGi services as well.
@@ -34,103 +34,259 @@
 
 Basic Usage
 In the simplest case, the class is annotated with @Model and 
the adaptable class. Fields which need to be injected are annotated with 
@Inject:
-::java @Model(adaptables=Resource.class) public class MyModel {
-@Inject private String propertyName; }
+::java
+@Model(adaptables=Resource.class)
+public class MyModel {
+
+@Inject
+private String propertyName;
+}
+
 In this case, a property named "propertyName" will be looked up from the 
Resource (after first adapting it to a ValueMap) and it is 
injected.
 For an interface, it is similar:
-::java @Model(adaptables=Resource.class) public interface MyModel {
-@Inject String getPropertyName(); }
+::java
+@Model(adaptables=Resource.class)
+public interface MyModel {
+
+@Inject
+String getPropertyName();
+}
+
 Constructor injection is also supported (as of Sling Models 1.1.0):
-::java @Model(adaptables=Resource.class) public class MyModel { @Inject 
public MyModel(@Named("propertyName") String propertyName) { // constructor 
code } }
+::java
+@Model(adaptables=Resource.class)
+public class MyModel {
+@Inject
+public MyModel(@Named("propertyName") String propertyName) {
+  // constructor code
+}
+}
+
 Because the name of a constructor argument parameter cannot be detected via 
the Java Reflection API a @Named annotation is mandatory for 
injectors that require a name for resolving the injection.
 In order for these classes to be picked up, there is a header which must be 
added to the bundle's manifest:
- org.apache.sling.models.it.models 

+
+  org.apache.sling.models.it.models
+
+
 This header must contain all packages which contain model classes or 
interfaces. However, subpackages need not be listed individually, e.g. the 
header above will also pick up model classes in 
org.apache.sling.models.it.models.sub. Multiple packages can be 
listed in a comma-separated list (any whitespace will be removed):
- org.apache.sling.models.it.models, 
org.apache.sling.other.models 
+
+  org.apache.sling.models.

[25/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup


Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/b033d3d7
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/b033d3d7
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/b033d3d7

Branch: refs/heads/asf-site
Commit: b033d3d713d5e85ccae6b331eaee085c42310073
Parents: 3a935d0
Author: Bertrand Delacretaz 
Authored: Wed Jun 21 09:21:36 2017 +0200
Committer: Bertrand Delacretaz 
Committed: Wed Jun 21 09:21:36 2017 +0200

--
 documentation/bundles/2010-07-01_1036.png   |   Bin 0 -> 35073 bytes
 documentation/bundles/Slide14.jpg   |   Bin 0 -> 76316 bytes
 .../config-resource-lookup.png  |   Bin 0 -> 38694 bytes
 .../context-and-config-reference.png|   Bin 0 -> 27362 bytes
 .../context-aware-config-example.png|   Bin 0 -> 21149 bytes
 .../illustration-sources.pptx   |   Bin 0 -> 32227 bytes
 .../resource-inheritance.png|   Bin 0 -> 28057 bytes
 .../bundles/discovery-impl-split-brain.png  |   Bin 0 -> 96082 bytes
 documentation/bundles/jconsole-hc.jpg   |   Bin 0 -> 148619 bytes
 documentation/bundles/mdc-filter-config.png |   Bin 0 -> 35715 bytes
 documentation/bundles/metric-web-console.png|   Bin 0 -> 97296 bytes
 documentation/bundles/mimetypes.png |   Bin 0 -> 78378 bytes
 .../bundles/requesttracker-details.png  |   Bin 0 -> 116868 bytes
 documentation/bundles/requesttracker.png|   Bin 0 -> 121842 bytes
 .../bundles/resource-editor-screenshot.png  |   Bin 0 -> 525087 bytes
 .../Scripting-Thymeleaf-Class-Diagram.png   |   Bin 0 -> 64028 bytes
 ...g-Thymeleaf-Pattern-TemplateModeProvider.png |   Bin 0 -> 325263 bytes
 ...Thymeleaf-ResourceBundle-MessageResolver.png |   Bin 0 -> 148700 bytes
 .../Scripting-Thymeleaf-ScriptEngineFactory.png |   Bin 0 -> 346546 bytes
 ...hymeleaf-Sling-Resource-TemplateResolver.png |   Bin 0 -> 133754 bytes
 .../bundles/scripting/sling-fling-sample.png|   Bin 0 -> 227987 bytes
 documentation/bundles/sling-hc-plugin.jpg   |   Bin 0 -> 113760 bytes
 .../bundles/sling-main-servlet-config.png   |   Bin 0 -> 225507 bytes
 documentation/bundles/tracer-config.png |   Bin 0 -> 68924 bytes
 .../eclipse-settings-null-analysis.png  |   Bin 0 -> 189331 bytes
 .../ide-tooling/add-remove-projects.png |   Bin 0 -> 42031 bytes
 .../ide-tooling/content-navigator.png   |   Bin 0 -> 12498 bytes
 .../ide-tooling/convert-to-bundle-projects.png  |   Bin 0 -> 41976 bytes
 documentation/development/ide-tooling/debug.png |   Bin 0 -> 83280 bytes
 .../development/ide-tooling/jcr-properties.png  |   Bin 0 -> 20510 bytes
 .../ide-tooling/launchpad-models-directory.png  |   Bin 0 -> 7214 bytes
 .../ide-tooling/missing-scr-descriptor.png  |   Bin 0 -> 33122 bytes
 .../ide-tooling/new-bundle-project-step-1.png   |   Bin 0 -> 29861 bytes
 .../ide-tooling/new-bundle-project-step-2.png   |   Bin 0 -> 28009 bytes
 .../ide-tooling/new-bundle-project-step-3.png   |   Bin 0 -> 30317 bytes
 .../ide-tooling/new-bundle-project-step-4.png   |   Bin 0 -> 37535 bytes
 .../ide-tooling/new-content-project-step-1.png  |   Bin 0 -> 28649 bytes
 .../ide-tooling/new-content-project-step-2.png  |   Bin 0 -> 23603 bytes
 .../ide-tooling/new-content-project-step-3.png  |   Bin 0 -> 37535 bytes
 .../development/ide-tooling/new-server-2.png|   Bin 0 -> 51234 bytes
 .../development/ide-tooling/new-server.png  |   Bin 0 -> 42477 bytes
 .../ide-tooling/repository-export.png   |   Bin 0 -> 21165 bytes
 .../ide-tooling/repository-import.png   |   Bin 0 -> 27492 bytes
 .../ide-tooling/server-definition.png   |   Bin 0 -> 76595 bytes
 .../development/ide-tooling/servers-view.png|   Bin 0 -> 11728 bytes
 .../development/ide-tooling/sightly-editor.png  |   Bin 0 -> 40387 bytes
 .../development/ide-tooling/sling-console.png   |   Bin 0 -> 29372 bytes
 .../development/ide-tooling/tracing.png |   Bin 0 -> 46963 bytes
 .../development/sling-datasource-config.png |   Bin 0 -> 69485 bytes
 documentation/development/sling-log-support.png |   Bin 0 -> 92565 bytes
 .../development/sling-requests-plugin.jpg   |   Bin 0 -> 142155 bytes
 .../the-sling-engine/authentication.png |   Bin 0 -> 27987 bytes
 .../tutorials-how-tos/DropBoxEventHandler.java  |82 +
 .../tutorials-how-tos/DropBoxService.java   |53 +
 obr/obr2html.xsl|   119 +
 obr/repository.xml  | 7 +
 obr/sling.xml   | 18233 +
 obr/thirdparty.xml  |   673 +
 res/css/icons/check.gif |   Bin 0 -> 604 bytes
 res/css/icons/forbidden.g

[18/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
--
diff --git 
a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
 
b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
index 53be8bd..8cb6cce 100644
--- 
a/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
+++ 
b/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Manipulating Content - The SlingPostServlet 
(servlets.post)[TOC]
 Multiple Ways to Modify Content
@@ -25,17 +25,23 @@
 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
 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:
-http://host/some/new/content"; 
enctype="multipart/form-data">
-
-
-
+

+   
+   
+
+
 This simple form will set the title and text 
properties on a node at /some/new/content. If this node does not 
exist it is just created otherwise the existing content would be modified.
 Similarly, you can do this using the curl command line 
tool:
-$ curl -Ftitle="some title text" -Ftext="some body text content" 
http://host/some/new/content
+$ curl -Ftitle="some title text" -Ftext="some body 
text content" http://host/some/new/content
+
 You might want to use a specific JCR node type for a newly created node. 
This is possible by simply setting a jcr:primaryType property on 
the request, e.g.
-$ curl -F"jcr:primaryType=nt:unstructured" -Ftitle="some title text" 
-Ftext="some body text content" http://host/some/new/content
+$ curl -F"jcr:primaryType=nt:unstructured" 
-Ftitle="some title text" \
+-Ftext="some body text content" http://host/some/new/content
+
 Sim

[21/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/configuration-installer-factory.html
--
diff --git a/documentation/bundles/configuration-installer-factory.html 
b/documentation/bundles/configuration-installer-factory.html
index 67aa156..21222b3 100644
--- a/documentation/bundles/configuration-installer-factory.html
+++ b/documentation/bundles/configuration-installer-factory.html
@@ -2,42 +2,62 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Configuration Installer FactoryThe 
configuration installer factory provides support for configurations to the OSGI installer. The 
provisioning of artifacts is handled by installer providers like the file 
installer or the JCR installer.
 Configurations
 Configuration file names are related to the PID and factory PID. The 
structure of the file name is as follows:
-filename ::=  ( '-'  )? ('.cfg'|'.config')
+filename ::=  ( '-'  )? 
('.cfg'|'.config')
+
 If the form is ('.cfg'|'.config'), 
the file contains the properties for a Managed Service. The 
 is then the PID of the Managed Service. See the 
Configuration Admin service for details.
 When a Managed Service Factory is used, the situation is different. The 
 part then describes the PID of the Managed Service 
Factory. You can pick any , the installer will then 
create an instance for the factory for each unique name. For example:
-com.acme.xyz.cfg // configuration for Managed Service // com.acme.xyz 
com.acme.abc-default.cfg // Managed Service Factory, // creates an instance for 
com.acme.abc
+com.acme.xyz.cfg // configuration for Managed Service
+// com.acme.xyz
+com.acme.abc-default.cfg // Managed Service Factory,
+// creates an instance for com.acme.abc
+
 If a configuration is modified, the file installer will write the 
configuration back to a file to ensure peristence across restarts (if 
sling.fileinstall.writeback is enabled).
 Property Files (.cfg)
 Configuration files ending in '.cfg' are plain property files 
(java.util.Property). The format is simple:
-file ::= ( header | comment ) * header ::=  ( ':' | '=' )  ( 
'  ) * comment ::= '#' 
+file ::= ( header | comment ) *
+header ::= 
 ( ':' | '=' )  ( 
'\  ) *
+comment ::= '#' 
+
 Notice that this model only supports string properties. For example:
-default port
-ftp.port = 21
+# default port
+ftp.port = 21
+
 Configuration Files (.config)
 Configuration files ending in '.config' use the format of the Apache Felix 
ConfigAdmin implementation. It allows to specify the type and cardinality of a 
configuration property and is not limited to string values.
 The first line of such a file might start with a comment

[02/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/news/sling-launchpad-9-released.html
--
diff --git a/news/sling-launchpad-9-released.html 
b/news/sling-launchpad-9-released.html
index 5f9508c..9eb9490 100644
--- a/news/sling-launchpad-9-released.html
+++ b/news/sling-launchpad-9-released.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Apache Sling Launchpad 9 releasedHere 
are some of the more noteworthy things available in this release.
 Updated to Oak 1.6.1 and segment-tar persistence
@@ -41,7 +41,8 @@
 The http://sling.apache.org/components/htl-maven-plugin/";>HTL 
Maven Plugin provides build-time validation for projects using HTL. 
Furthermore, the HTL engine has been modularised into an HTL Compiler, an HTL 
Java Compiler and an HTL Script Engine, with the first two allowing to build 
other HTL tools in a Sling-independent way.
 Streaming Upload Support
 The version of the Sling Engine shipped in the Launchpad now supports 
streaming uploads, for better I/O throughput. Streaming uploads are opt-in via 
setting the following HTTP Header:
-Sling-UploadMode: stream
+Sling-UploadMode: stream
+
 Discovery: added Oak-based discovery implementation
 The Sling discovery mechanism has been augmented with a mechanism which 
delegates instance discovery to Oak. When working with a 
DocumentNodeStore-based Oak implementation, this information is already 
available to Oak so there is no point in duplicating the work.
 Security: loginAdministrative deprecation

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/old-stuff.html
--
diff --git a/old-stuff.html b/old-stuff.html
index 80d1228..8bf7746 100644
--- a/old-stuff.html
+++ b/old-stuff.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.

[23/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/b033d3d7/obr/thirdparty.xml
--
diff --git a/obr/thirdparty.xml b/obr/thirdparty.xml
new file mode 100644
index 000..d1eb82d
--- /dev/null
+++ b/obr/thirdparty.xml
@@ -0,0 +1,673 @@
+
+
+
+
+http://repo1.maven.org/maven2/org/apache/jackrabbit/jackrabbit-api/1.5.0/jackrabbit-api-1.5.0.jar";
 version="1.5.0">
+Jacrabbit-specific extensions to the JCR API
+26810
+http://jackrabbit.apache.org
+org/apache/jackrabbit/jackrabbit-api/1.5.0/jackrabbit-api-1.5.0-sources.jar
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Import package 
javax.jcr
+Import package javax.jcr.lock
+Import package 
javax.jcr.nodetype
+Import package 
javax.jcr.observation
+Import package javax.jcr.version
+Import package 
javax.security.auth
+Import package 
javax.transaction.xa
+Import package 
org.apache.jackrabbit.api ;version=1.5.0
+Import package 
org.apache.jackrabbit.api.jsr283 ;version=1.5.0
+Import package 
org.apache.jackrabbit.api.jsr283.nodetype ;version=1.5.0
+Import package 
org.apache.jackrabbit.api.jsr283.retention ;version=1.5.0
+Import package 
org.apache.jackrabbit.api.jsr283.security ;version=1.5.0
+Import package 
org.apache.jackrabbit.api.observation ;version=1.5.0
+Import package 
org.apache.jackrabbit.api.security.principal ;version=1.5.0
+Import package 
org.apache.jackrabbit.api.security.user ;version=1.5.0
+Import package org.xml.sax
+
+http://repo1.maven.org/maven2/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.0/jackrabbit-jcr-commons-1.5.0.jar";
 version="1.5.0">
+General purpose classes for use with the JCR API
+202761
+http://jackrabbit.apache.org
+org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.0/jackrabbit-jcr-commons-1.5.0-sources.jar
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Import package 
javax.jcr
+Import package javax.jcr.lock
+Import package 
javax.jcr.nodetype
+Import package 
javax.jcr.observation
+Import package javax.jcr.query
+Import package javax.jcr.util
+Import package javax.jcr.version
+Import package javax.naming
+Import package javax.xml.parsers
+Import package 
javax.xml.transform
+Import package 
javax.xml.transform.sax
+Import package 
javax.xml.transform.stream
+Import package 
org.apache.jackrabbit ;version=1.5.0
+Import package 
org.apache.jackrabbit.commons ;version=1.5.0
+Import package 
org.apache.jackrabbit.commons.iterator ;version=1.5.0
+Import package 
org.apache.jackrabbit.commons.packaging ;version=1.5.0
+Import package 
org.apache.jackrabbit.commons.predicate ;version=1.5.0
+Import package 
org.apache.jackrabbit.commons.query ;version=1.5.0
+Import package 
org.apache.jackrabbit.commons.repository ;version=1.5.0
+Import package 
org.apache.jackrabbit.commons.visitor ;version=1.5.0
+Import package 
org.apache.jackrabbit.commons.xml ;version=1.5.0
+Import package 
org.apache.jackrabbit.name ;version=1.5.0
+Import package 
org.apache.jackrabbit.util ;version=1.5.0
+Import package 
org.apache.jackrabbit.util.name ;version=1.5.0
+Import package 
org.apache.jackrabbit.uuid ;version=1.5.0
+Import package 
org.apache.jackrabbit.value ;version=1.5.0
+Import package org.xml.sax
+Import package 
org.xml.sax.helpers
+
+http://repository.codehaus.org/org/codehaus/groovy/groovy-all/1.6-RC-3/groovy-all-1.6-RC-3.jar";
 version="1.6.0.RC-3">
+Groovy Runtime
+4392238
+http://groovy.codehaus.org/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Import package 
com.thoughtworks.xstream
+Import package groovy.beans 
;version=1.6.0.RC-3
+Import package groovy.grape 
;version=1.6.0.RC-3
+Import package groovy.inspect 
;version=1.6.0.RC-3
+Import package 
groovy.inspect.swingui ;version=1.6.0.RC-3
+Import package groovy.io 
;version=1.6.0.RC-3
+Import package 
groovy.jmx.builder ;version=1.6.0.RC-3
+Import package groovy.lang 
;version=1.6.0.RC-3
+Import package 
groovy.mock.interceptor ;version=1.6.0.RC-3
+Import package groovy.model 
;version=1.6.0.RC-3
+Import package groovy.security 
;version=1.6.0.RC-3
+Import package groovy.servlet 
;version=1.6.0.RC-3
+Import package groovy.sql 
;

[15/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/scripting.html
--
diff --git a/documentation/bundles/scripting.html 
b/documentation/bundles/scripting.html
index ef99cd5..1764b33 100644
--- a/documentation/bundles/scripting.html
+++ b/documentation/bundles/scripting.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Sling Scripting[TOC]
 Sling Scripting allows the easy development and usage of different 
scripting (aka templating) engines.
@@ -36,9 +36,8 @@
   Thymeleaf 
*
   Velocity *
   XProc *
-  
-  in contrib
-
+
+* in contrib
 
 
 TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/scripting/scripting-htl.html
--
diff --git a/documentation/bundles/scripting/scripting-htl.html 
b/documentation/bundles/scripting/scripting-htl.html
index 69e988f..f81e671 100644
--- a/documentation/bundles/scripting/scripting-htl.html
+++ b/documentation/bundles/scripting/scripting-htl.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">

[04/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/tutorials-how-tos.html
--
diff --git a/documentation/tutorials-how-tos.html 
b/documentation/tutorials-how-tos.html
index e05f226..b54b467 100644
--- a/documentation/tutorials-how-tos.html
+++ b/documentation/tutorials-how-tos.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Tutorials & How-Tos{% for label, page 
in children %}* [{{ page.headers.title }}]({{ page.path }}) {% endfor 
%}
 

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/tutorials-how-tos/46-line-blog.html
--
diff --git a/documentation/tutorials-how-tos/46-line-blog.html 
b/documentation/tutorials-how-tos/46-line-blog.html
index 009ebdb..26c4061 100644
--- a/documentation/tutorials-how-tos/46-line-blog.html
+++ b/documentation/tutorials-how-tos/46-line-blog.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/

[08/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/development/version-policy.html
--
diff --git a/documentation/development/version-policy.html 
b/documentation/development/version-policy.html
index f6c7b55..e50b84d 100644
--- a/documentation/development/version-policy.html
+++ b/documentation/development/version-policy.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Version PolicyExcerpt: This page is 
about how we assign versions to exported packages and bundles and defines when 
to increase which part of the version number.
 This page is about how we assign versions to exported packages and bundles 
and defines when to increase which part of the version number.
@@ -67,7 +67,13 @@ Please note that this page is currently in draft stage and 
still being discussed
 Future
 The newest versions of the bnd library also support an @Export 
annotation in the package-info.java pseudo class file. This pseudo 
class is supported starting with Java 5 to take package level annotations (like 
the @Export annotation) and as a replacement of the 
package-info.html file.
 Using this syntax something like the following would be easily possible:
-/** * This is the Package Level JavaDoc */ @Export(version = "1.0") package 
org.apache.sling.api.auth; import aQute.bnd.annotation.Export;
+/**
+ * This is the Package Level JavaDoc
+ */
+@Export(version = "1.0")
+package org.apache.sling.api.auth;
+import aQute.bnd.annotation.Export;
+
 See http://bnd.bndtools.org/chapters/170-versioning.html";>bnd 
Versioning for details.
 Version Number Syntax
 As a small reminder, this is how a version number is constructed: In OSGi 
version numbers are composed of four (4) segments: three integers and one 
string named major._minor_._micro_._qualifier_.
@@ -203,11 +209,13 @@ Please note that this page is currently in draft stage 
and still being discussed
   If such a lower bound exists, the upper bound is exclusive the next 
major version number.
 
 For example if importing the api package exported at version 
1.2.3, the Import-Package statement is generated as
-Import-Package: api;version=[1.2.3,2.0.0)
+Import-Package: api;version=[1.2.3,2.0.0)
+
 This default works well for consumers of the API, since according to above 
definitions an API is guaranteed to not contain breakages if the major version 
number is not increased.
 For bundles implementing the API, this default does not work well, since 
from their point of view an externally visible change in fact 
constitutes a breakage, because the implementation is not complete. So if a 
bundle implements a package a manually crafted import version should be defined 
which includes the export version o

[12/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/development/getting-and-building-sling.html
--
diff --git a/documentation/development/getting-and-building-sling.html 
b/documentation/development/getting-and-building-sling.html
index 43d0e23..4d475cf 100644
--- a/documentation/development/getting-and-building-sling.html
+++ b/documentation/development/getting-and-building-sling.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Getting and Building SlingExcerpt: A 
quick guide for getting the Sling source, then building and running the 
resulting Sling instance; either without or with Eclipse.
 A quick guide for getting the Sling source, then building and running the 
resulting Sling instance; either without or with Eclipse.
@@ -25,7 +25,13 @@
 Rather than performing a full build of Sling, which can take 5-10 minutes 
on a recent computer once your local Maven repository is up to date, it's 
recommended to build only the launchpad and the modules you're interested 
in.
 tl:dr - Short form build + run instructions
 If you already have the required svn (or Git, see below) client, JDK and 
Maven installed, here's the short form recipe:
-$ svn co http://svn.apache.org/repos/asf/sling/trunk sling $ cd sling # you 
are now in the Sling SVN checkout $ cd launchpad/builder $ mvn 
--update-snapshots clean install $ export DBG="-Xmx384M -agentlib:jdwp..." # 
(see below) $ java $DBG -jar target/org.apache.sling.launchpad... # (see 
below)
+$ svn co http://svn.apache.org/repos/asf/sling/trunk sling 
+$ cd sling  # you are now in the Sling SVN checkout
+$ cd launchpad/builder
+$ mvn --update-snapshots clean install
+$ export DBG="-Xmx384M -agentlib:jdwp..." # (see below)
+$ java $DBG -jar target/org.apache.sling.launchpad... # (see below)
+
 With this, Sling should be running at http://localhost:8080 with remote 
debugging active as per the $DBG variable.
 Prerequisites
 Before you begin, you need to have the following tools installed on your 
system:
@@ -43,10 +49,11 @@
 The full build process requires quite a lot of resources, so you may run 
into limits. The following hints should show you what to setup before building 
Sling.
 Environment Variable Space
 
-  Problem - Build aborts when trying to launch the integration 
tests with the message
+  Problem - Build aborts when trying to launch the integration 
tests with the message
+[INFO] Error while executing forked tests.; nested exception is 
org.apache.maven.surefire.booter.shade.org.codehaus.plexus.util.cli.CommandLineException:
 Error setting up environmental variables
+error=12, Not enough space
+  
 
-[INFO] Error while executing forked tests.; nested exception is 

[19/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/jcr-installer-provider.html
--
diff --git a/documentation/bundles/jcr-installer-provider.html 
b/documentation/bundles/jcr-installer-provider.html
index 3e99c6f..dd414de 100644
--- a/documentation/bundles/jcr-installer-provider.html
+++ b/documentation/bundles/jcr-installer-provider.html
@@ -2,27 +2,27 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 JCR Installer ProviderThe JCR 
installer provider scans the JCR repository for artifacts and provides them to 
the OSGI installer.
 Configuration and Scanning
 The JCR installer provider can be configured with weighted paths which are 
scanned. By default, the installer scans in /apps and /libs 
where artifacts found in /apps get a higher priority. The installer 
does a deep scan and uses a regular expression to detect folders containing 
artifacts to be installed. By default, artifacts from within a folder named 
install are provided to the OSGi installer.
-If such an install folder contains a binary artifact (e.g. a bundle or a 
config file as described in Configuration
 Installer Factory) this is provided to the OSGi installer.
+If such an install folder contains a binary artifact (e.g. a bundle or a 
config file as described in Configuration
 Installer Factory) this is provided to the OSGi installer. 
 In addition every node of type sling:OsgiConfig is provided as a 
configuration to the installer. This has the advantage of leveraging the JCR 
structure better than binary files, but has the known limitations outlined in 
https://issues.apache.org/jira/browse/SLING-4183";>SLING-4183 and 
https://issues.apache.org/jira/browse/SLING-2477";>SLING-2477, 
therefore it is recommended to stick to one of the binary formats described in 
Configuration
 Installer Factory.
 The JCR installer provider does not check or scan the artifacts itself, the 
detection and installation is deferred to the OSGi installer.
 Runmode Support
@@ -32,7 +32,7 @@
 The JCR installer supports writing back of configurations which are changed 
by some other ways, e.g by using the Apache Felix web console. If this is a new 
configuration which was not originally stored in the repository, a new 
configuration is stored under /apps/sling/install. The highest search 
path is used together with a configurable folder (*sling/install* in this 
case). If a configuration is changed which already exists in the repository, 
then it depends where the original configuration is stored. If its under 
/libs a new configuration at the same path under /apps is 
created. Otherwise the configuration is directly modified. As JCR properties do 
not support all Java primitive types like 

[10/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/development/release-management.html
--
diff --git a/documentation/development/release-management.html 
b/documentation/development/release-management.html
index 973003f..972b40c 100644
--- a/documentation/development/release-management.html
+++ b/documentation/development/release-management.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Release ManagementSling releases (and 
SNAPSHOTS) are deployed to the http://repository.apache.org";>Nexus 
repository instead of the traditional deployment via the Maven 2 mirrors 
source on people.apache.org. This makes the release process much 
leaner and simpler. In addtion we can benefit from the Apache Parent POM 6, 
which has most of the release profile setup built-in.
 Most of the hard work of preparing and deploying the release is done by 
Maven.
@@ -30,69 +30,113 @@
   See Appendix B for Maven and SCM credentials
 
 Note: Listing the Apache servers in the settings.xml 
file also requires adding the password to that file. Starting with Maven 2.1 
this password may be encrypted and needs not be give in plaintext. Please refer 
to http://maven.apache.org/guides/mini/guide-encryption.html";>Password 
Encryption for more information.
-In the past we staged release candidates on our local machines using a 
semi-manual process. Now that we inherit from the Apache parent POM version 6, 
a repository manager will automatically handle staging for you. This means you 
now only need to specify your GPG passphrase in the release profile of your 
${user.home}/.m2/settings.xml:
- ...   apache-release  
   
   ... 
+In the past we staged release candidates on our local machines using a 
semi-manual process. Now that we inherit from the Apache parent POM version 6, 
a repository manager will automatically handle staging for you. This means you 
now only need to specify your GPG passphrase in the release profile of your 
$\{user.home\}/.m2/settings.xml:
+
+...
+
+
+apache-release
+
+  

+
+
+
+...
+
+
 Everything else has been configured in the latest Sling Parent POM:
- org.apache.sling sling 
6 
+
+org.apache.sling
+sling
+6
+
+
 Staging the Release Candidates
 First prepare your POMs for release:
 
   Make sure there are no snapshots in the POMs to be released. In case you 
rely on

[20/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/context-aware-configuration/context-aware-configuration.html
--
diff --git 
a/documentation/bundles/context-aware-configuration/context-aware-configuration.html
 
b/documentation/bundles/context-aware-configuration/context-aware-configuration.html
index 2836168..bec9e19 100644
--- 
a/documentation/bundles/context-aware-configuration/context-aware-configuration.html
+++ 
b/documentation/bundles/context-aware-configuration/context-aware-configuration.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Apache Sling Context-Aware 
Configuration[TOC]
 About
@@ -41,23 +41,29 @@
   getting all child resources of a named configuration resource.
 
 For example to get a configuration resource for a content resource at 
/content/mysite/page1, you would get a reference to the OSGi service 
org.apache.sling.caconfig.resource.ConfigurationResourceResolver 
and write:
-!java
-Resource contentResource = 
resourceResolver.getResource("/content/mysite/page1");
-Resource configResource = 
configurationResourceResolver.getResource(contentResource, "my-bucket", 
"my-config");
+#!java
+Resource contentResource = 
resourceResolver.getResource("/content/mysite/page1");
+
+Resource configResource = 
configurationResourceResolver.getResource(contentResource, 
"my-bucket", "my-config");
+
 Or if you have several configuration resources of the same type and you 
need all of them:
-!java
-Collection configResources = 
configurationResourceResolver.getResourceCollection(contentResource, 
"my-bucket", "my-config");
+#!java
+Collection configResources = 
configurationResourceResolver.getResourceCollection(contentResource, 
"my-bucket", "my-config");
+
 The ConfigurationResourceResolver has a concept of "buckets" (2nd parameter 
in the method signatures) that allows to separate different types of 
configuration resources into different resource hierarchies, so you have a 
separate "namespaces" for the named configuration resources. For example one 
bucket for workflow definitions, one bucket for template definitions, one for 
key/value-pairs.
 The configuration name (3rd parameter) defines which configuration you are 
interested in. The name can be a relative path as well (e.g. 
"sub1/my-config").
 Context-Aware Configurations
 While context-aware resources give you pure resources and your application 
code can decide what to do with it, the most common use case is some 
configuration. A configuration is usually described by an annotation class 
(like Declarative Services does for component configurations). These are typed 
configuration objects and the context-aware configuration suppo

[16/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/rendering-content-default-get-servlets.html
--
diff --git a/documentation/bundles/rendering-content-default-get-servlets.html 
b/documentation/bundles/rendering-content-default-get-servlets.html
index 644c84f..2603ff9 100644
--- a/documentation/bundles/rendering-content-default-get-servlets.html
+++ b/documentation/bundles/rendering-content-default-get-servlets.html
@@ -2,22 +2,22 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Rendering Content - Default GET 
Servlets[TOC]
 
@@ -28,7 +28,7 @@ page needs more work.
 Sling provides a number of default GET and HEAD servlets, in the 
org.apache.sling.servlets.get bundle.
 This provides useful functionality out of the box: JSON rendering of 
content for example, usually does not require custom code.
 This page provides an overview of these default servlets.
-Currently, only the DefaultGetServlet has configuration 
parameters. Those are found at 
/system/console/configMgr/org.apache.sling.servlets.get.DefaultGetServlet
 on a standard Sling setup, and should be self-explaining. One common use is to 
disable some of the default renderings listed below, as they might not be 
useful or desired on production systems.
+Currently, only the DefaultGetServlet has configuration 
parameters. Those are found at 
/system/console/configMgr/org.apache.sling.servlets.get.DefaultGetServlet
 on a standard Sling setup, and should be self-explaining. One common use is to 
disable some of the default renderings listed below, as they might not be 
useful or desired on production systems. 
 Default renderings
 Default JSON rendering
 Adding a .json extension to a request triggers the default Sling GET 
servlet in JSON mode, unless a more specific servlet or script is provided for 
the current resource.
@@ -53,7 +53,7 @@ page needs more work.
 This is not to be confused with the sling:redirect property 
used under /etc/map, which is described in Mappings
 for Resource Resolution
 SlingInfoServlet
 The SlingInfoServlet provides info on the current JCR session, 
for requests that map to JCR nodes.
-It is available at /system/sling/info.sessionInfo by default, 
and supports .json and .txt 
extensions.
+It is available at /system/sling/info.sessionInfo by default, 
and supports .json and .txt extensions. 

 
 
 TODO display revision number here

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/bundles/repository-initialization.html
--
diff --git a/documentation/bundles/repository-initialization.html 
b/docum

[24/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/b033d3d7/obr/sling.xml
--
diff --git a/obr/sling.xml b/obr/sling.xml
new file mode 100644
index 000..e190e59
--- /dev/null
+++ b/obr/sling.xml
@@ -0,0 +1,18233 @@
+
+  
+Provides a web console configuration printer to provide 
details around classloader leaks
+18203
+http://sling.apache.org
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+  
+  
+  
+  
+
+Import package 
org.osgi.framework;version="[1.6,2)"
+Import package 
org.osgi.framework.wiring;version="[1.0,2)"
+Import package 
org.osgi.util.tracker;version="[1.5,2)"
+Import package 
org.slf4j;version="[1.5,2)"
+Execution Environment 
(|(ee=J2SE-1.5))
+  
+  
+Bundle implementing the AdapterManager and provides a 
convenienceimplementation of the Adaptable interface to make use of 
thisAdapterManager.
+29894
+http://sling.apache.org
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+Import package 
org.apache.sling.api.adapter;version="[2.2,2.3)"
+Import package 
javax.servlet
+Import package 
javax.servlet.http
+Import package 
org.apache.commons.io;version="[1.4,2)"
+Import package 
org.apache.commons.lang.builder;version="[2.5,3)"
+Import package 
org.apache.sling.adapter;version="[2.1,3)"
+Import package 
org.apache.sling.api.resource;version="[2.1,3)"
+Import package 
org.apache.sling.commons.json;version="[2.0,3)"
+Import package 
org.apache.sling.commons.osgi;version="[2.1,3)"
+Import package 
org.osgi.framework;version="[1.4,2)"
+Import package 
org.osgi.service.component;version="[1.0,2)"
+Import package 
org.osgi.service.event;version="[1.1,2)"
+Import package 
org.osgi.service.packageadmin;version="[1.2,2)"
+Import package 
org.osgi.util.tracker;version="[1.3,2)"
+Import package 
org.slf4j;version="[1.5,2)"
+Execution Environment 
(|(ee=JavaSE-1.6))
+  
+  
+Bundle implementing the AdapterManager and provides a 
convenienceimplementation of the Adaptable interface to make use of 
thisAdapterManager.
+26558
+http://sling.apache.org
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+Import package 
org.apache.sling.api.adapter;version="[2.2,2.3)"
+Import package 
javax.servlet
+Import package 
javax.servlet.http
+Import package 
org.apache.commons.io;version="[1.4,2)"
+Import package 
org.apache.commons.lang.builder;version="[2.5,3)"
+Import package 
org.apache.sling.api.resource;version="[2.1,3)"
+Import package 
org.apache.sling.commons.json;version="[2.0,3)"
+Import package 
org.apache.sling.commons.osgi;version="[2.1,3)"
+Import package 
org.osgi.framework;version="[1.4,2)"
+Import package 
org.osgi.service.component;version="[1.0,2)"
+Import package 
org.osgi.service.event;version="[1.1,2)"
+Import package 
org.osgi.util.tracker;version="[1.3,2)"
+Import package 
org.slf4j;version="[1.5,2)"
+Execution Environment 
(|(ee=J2SE-1.5))
+  
+  
+Bundle implementing the AdapterManager and provides a 
convenienceimplementation of the Adaptable interface to make use of 
thisAdapterManager.
+29037
+http://sling.apache.org
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+Import package 
org.apache.sling.api.adapter;version="[2.2,2.3)"
+Import package 
javax.servlet
+Import package 
javax.servlet.http
+Import package 
org.apache.commons.io;version="[1.4,2)"
+Import package 
org.apache.commons.lang.builder;version="[2.5,3)"
+Import package 
org.apache.sling.adapter;version="[2.1,3)"
+Import package 
org.apache.sling.api.resource;version="[2.1,3)"
+Import package 
org.apache.sling.commons.json;version="[2.0,3)"
+Import package 
org.apache.sling.commons.osgi;version="[2.1,3)"
+Import package 
org.osgi.framework;version="[1.4,2)"
+Import package 
org.osgi.service.component;version="[1.0,2)"
+Import package 
org.osgi.service.event;version="[1.1,2)"
+Import package 
org.osgi.service.packageadmin;version="[1.2,2)"
+Import package 
org.osgi.util.tracker;version="[1.3,2)"
+Import package 
org.slf4j;version="[1.5,2)"
+Execution Environment 
(|(ee=J2SE-1.5))
+  
+  
+Bundle implementing the AdapterManager and provides a 
convenienceimplementation of the Adaptable interface to make use of 
thisAdapterManager.
+30211
+http://sling.apache.org
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+Import package 
org.apache.sling.api

[06/25] sling-site git commit: Testing with /ng/ context path for temporary https://sling.apache.org/ng/ setup

[bdelacretaz]

http://git-wip-us.apache.org/repos/asf/sling-site/blob/3a935d04/documentation/the-sling-engine/filters.html
--
diff --git a/documentation/the-sling-engine/filters.html 
b/documentation/the-sling-engine/filters.html
index 4832c93..b2a0e22 100644
--- a/documentation/the-sling-engine/filters.html
+++ b/documentation/the-sling-engine/filters.html
@@ -2,29 +2,29 @@
 
 
 Apache Sling on JBake
-
-
+
+
 
 
 http://sling.apache.org";>
-
+
 
 
 http://www.apache.org";>
-
+
 
 
 
 
 
-DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject 
infoDownloadshttp://www.apache.org/licenses/";>LicenseContributingNewsLinksProject Informationhttps://issues.apache.org/jira/browse/SLING";>Issue Trackerhttp://ci.apache.org/builders/sling-trunk";>Build ServerSecuritySourcehttp://svn.apache.org/viewvc/sling/trunk";>SubversionGithttps://github.com/apache/sling";>Github 
MirrorSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsorhttps://donate.apache.org/";>Donate!http://www.apache.org/foun
 dation/buy_stuff.html">Buy StuffSite Map
+DocumentationGetting StartedThe Sling EngineDevelopmentBundlesTutorials & 
How-TosConfigurationhttp://s.apache.org/sling.wiki";>Wikihttp://s.apache.org/sling.faq";>FAQAPI 
DocsSling 9Sling 8Sling 7Sling 6Sling 5Archive at javadoc.ioProject infohref="/ng/downloads.cgi">Downloadshref="http://www.apache.org/licenses/";>Licensehref="/ng/contributing.html">Contributinghref="/ng/news.html">NewsLinkshref="/ng/project-information.html">Project Informationhref="https://issues.apache.org/jira/browse/SLING";>Issue Trackerhref="http://ci.apache.org/builders/sling-trunk";>Build Serverhref="/ng/project-information/security.html">SecuritySource href="http://svn.apache.org/viewvc/sling/trunk";>Subversionhref="git://git.apache.org/sling.git">Githref="https://github.com/apache/sling";>Github 
 >MirrorSponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/foundation/sponsorship.html";>Become a 
 >Sponsorhttps://donate.apache.
 org/">Donate!http://www.apache.org/foundation/buy_stuff.html";>Buy 
StuffSite Map
 
 Servlet Filter SupportSling supports 
filter processing by applying filter chains to the requests before actually 
dispatching to the servlet or script for processing. Filters to be used in such 
filter processing are plain OSGi services of type 
javax.servlet.Filter which of course means that the services 
implement this interface.
 
 See https://issues.apache.org/jira/browse/SLING-1213";>SLING-1213,
 https://issues.apache.org/jira/browse/SLING-1734";>SLING-1734, and
 http://markmail.org/message/quxhm7d5s6u66crr";>Registering filters 
with Sling
-for more details. The
+ for more details. The 
 https://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java";>NoPropertyFilter
 from our integration tests shows an example Sling Filter.
 
@@ -98,40 +98,76 @@ from our integration tests shows an example Sling Filter.
 Filter Processing
 Filter processing is part of the Sling request processing, which may be 
sketched as follows:
 
-  Request Level:
-  Authentication
-  Resource Resolution
-  Servlet/Script Resolution
-  Request Level Filter Processing
+  Request Level:
+
+  Authentication
+  Resource Resolution
+  Servlet/Script Resolution
+  Request Level Filter Processing
+
+  
 
 The first step of request processing is the Request Level 
processing which is concerned with resolving the resource, finding the 
appropriate servlet and calling into the request level filter chain. The next 
step is the Component Level processing, calling into the component 
level filters before finally calling the servlet or script:
 
-  Component Level:
-  Component Level Filter Processing
-  Call Servlet or Script
+  Component Level:
+
+  Component Level Filter Processing
+  Call Servlet or Script
+
+  
 
 When a servlet or script is including or forwarding to another resource for 
processing through the RequestDispatcher (or any JSP tag or other 
language feature ultimately using a RequestDispatcher) the 
following Dispatch processing takes place:
 
-  Dispatch:
-  Resolve the resource to dispatch to if not already defined when getting 
the RequestDispatcher
-  Servlet/Script resolution
-  Call include or forward filters depending on the kind of dispatch
-  

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

[buildbot]

Author: buildbot
Date: Wed Jun 21 07:05:50 2017
New Revision: 1014313

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 Wed Jun 21 07:05:50 2017
@@ -1 +1 @@
-1799340
+1799395

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Wed Jun 21 07:05:50 2017
@@ -1276,9 +1276,9 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Security
-1.1.2
-Bundle 
(http://www.apache.org/dist/sling/org.apache.sling.security-1.1.2.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.security-1.1.2.jar.md5";>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.security-1.1.2-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.security-1.1.2-source-release.zip.md5";>md5)
+1.1.4
+Bundle 
(http://www.apache.org/dist/sling/org.apache.sling.security-1.1.4.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.security-1.1.4.jar.md5";>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.security-1.1.4-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.security-1.1.4-source-release.zip.md5";>md5)
 
 
 Service User Mapper
@@ -1556,7 +1556,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 
   
-Rev. 1799340 by kwin on Tue, 20 Jun 2017 11:31:13 +
+Rev. 1799395 by asanso on Wed, 21 Jun 2017 07:05:25 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Modified: websites/staging/sling/trunk/content/news.html
==
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Wed Jun 21 07:05:50 2017
@@ -116,6 +116,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }
 
+New Releases: Apache Sling Security 1.1.4 (June 21st, 2017)
 New Releases: Apache Sling Testing Clients 1.1.4, Apache Sling Testing 
Email 1.0.0, Apache Sling Resource Merger 1.3.4 (June 20th, 2017)
 New Release: Apache Sling Slingstart Archetype (June 15th, 2017)
 New Release: Apache Sling JSPC Maven Plugin 2.1.0 and Apache Sling 
Slingstart Archetype 1.0.2 (June 15th, 2017)
@@ -603,7 +604,7 @@ Apache Sling Scripting Sightly JS Use Pr
 Apache Sling has graduated into a top level project! (June 17, 2009)
 
   
-Rev. 1799340 by kwin on Tue, 20 Jun 2017 11:31:13 +
+Rev. 1799395 by asanso on Wed, 21 Jun 2017 07:05:25 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

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

[asanso]

Author: asanso
Date: Wed Jun 21 07:05:25 2017
New Revision: 1799395

URL: http://svn.apache.org/viewvc?rev=1799395&view=rev
Log:
Release Apache Sling Security 1.1.4

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=1799395&r1=1799394&r2=1799395&view=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Wed Jun 21 07:05:25 2017
@@ -187,7 +187,7 @@ Scripting HTL JavaScript Use Provider|or
 Scripting HTL Sling Models Use 
Provider|org.apache.sling.scripting.sightly.models.provider|1.0.6
 Scripting HTL REPL|org.apache.sling.scripting.sightly.repl|1.0.4
 Scripting Thymeleaf|org.apache.sling.scripting.thymeleaf|1.1.0
-Security|org.apache.sling.security|1.1.2
+Security|org.apache.sling.security|1.1.4
 Service User Mapper|org.apache.sling.serviceusermapper|1.3.2
 Servlet Helpers|org.apache.sling.servlet-helpers|1.1.0
 Servlets Compat|org.apache.sling.servlets.compat|1.0.2

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1799395&r1=1799394&r2=1799395&view=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Wed Jun 21 07:05:25 2017
@@ -1,5 +1,6 @@
 Title: News
 
+* New Releases: Apache Sling Security 1.1.4 (June 21st, 2017)
 * New Releases: Apache Sling Testing Clients 1.1.4, Apache Sling Testing Email 
1.0.0, Apache Sling Resource Merger 1.3.4 (June 20th, 2017)
 * New Release: Apache Sling Slingstart Archetype (June 15th, 2017)
 * New Release: Apache Sling JSPC Maven Plugin 2.1.0 and Apache Sling 
Slingstart Archetype 1.0.2 (June 15th, 2017)