svn commit: r1793178 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: sseifert Date: Sat Apr 29 08:48:02 2017 New Revision: 1793178 URL: http://svn.apache.org/viewvc?rev=1793178=rev Log: Apache Sling Commons Johnzon 1.0.0 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1793178=1793177=1793178=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Sat Apr 29 08:48:02 2017 @@ -40,6 +40,7 @@ Commons Classloader|org.apache.sling.com Commons Compiler|org.apache.sling.commons.compiler|2.2.0 Commons FileSystem ClassLoader|org.apache.sling.commons.fsclassloader|1.0.6 Commons HTML|org.apache.sling.commons.html|1.0.0 +Commons Johnzon|org.apache.sling.commons.johnzon|1.0.0 Commons JSON|org.apache.sling.commons.json|2.0.20 Commons Log|org.apache.sling.commons.log|5.0.0 Commons Log WebConsole Plugin|org.apache.sling.commons.log.webconsole|1.0.0 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1793178=1793177=1793178=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Sat Apr 29 08:48:02 2017 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Commons Johnzon 1.0.0 (April 29th, 2017) * New Release: Apache Sling Event API 1.0.0 (April 19th, 2017) * New Releases: Apache Sling Validation API and Core 1.0.0 (April 12th, 2017) * New Release: Apache Sling Testing ResourceResolver Mock 1.1.18 (April 4th, 2017)
svn commit: r19406 - /release/sling/
Author: sseifert Date: Sat Apr 29 08:48:12 2017 New Revision: 19406 Log: Apache Sling Commons Johnzon 1.0.0 Added: release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar (with props) release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.asc release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.md5 release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.sha1 release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip (with props) release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip.asc release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip.md5 release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip.sha1 release/sling/org.apache.sling.commons.johnzon-1.0.0-sources.jar (with props) release/sling/org.apache.sling.commons.johnzon-1.0.0-sources.jar.asc release/sling/org.apache.sling.commons.johnzon-1.0.0-sources.jar.md5 release/sling/org.apache.sling.commons.johnzon-1.0.0-sources.jar.sha1 release/sling/org.apache.sling.commons.johnzon-1.0.0.jar (with props) release/sling/org.apache.sling.commons.johnzon-1.0.0.jar.asc release/sling/org.apache.sling.commons.johnzon-1.0.0.jar.md5 release/sling/org.apache.sling.commons.johnzon-1.0.0.jar.sha1 release/sling/org.apache.sling.commons.johnzon-1.0.0.pom release/sling/org.apache.sling.commons.johnzon-1.0.0.pom.asc release/sling/org.apache.sling.commons.johnzon-1.0.0.pom.md5 release/sling/org.apache.sling.commons.johnzon-1.0.0.pom.sha1 Added: release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.asc == --- release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.asc Sat Apr 29 08:48:12 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJZAFzZAAoJEM4rf/Z1146SZ8gH+QFfRd7xFU6OxPoaVhIOp8/v +WoKD/jwCZb9YBJQk2PVJVWy4ItVu4u96euMwyzQAc7QJmjqIJA2Ydyr9vyCtrwEb +pzjBqazrvQufjXTwkKeZ+nd3cBbHuhjnZqTo5pGBMJp9DFfap4mX+s5FkOEmZl7E +7eJYfAJOTsZCyqPyyTID3nzmnOe905wDas+NDZ+Upj6k+JRIyF+st1hC2uK3HYUa +H62ZcFhMiqu+rIw7udFFTfUJAzG2FNAOfMV4v4NfwYGxXtHmccLPprAMQ4lxndGm +5qKPjP2llrBr1R/AipbTMq9pE+p9S2lr2ApmHsyyH7u453dcXXpVx2xRY/yszKM= +=Cax5 +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.md5 == --- release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.md5 Sat Apr 29 08:48:12 2017 @@ -0,0 +1 @@ +c884a11b76410e6d1bb3db9f648b236b \ No newline at end of file Added: release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.sha1 == --- release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.commons.johnzon-1.0.0-javadoc.jar.sha1 Sat Apr 29 08:48:12 2017 @@ -0,0 +1 @@ +1504976822e50569560447c28aac333dfa2c7271 \ No newline at end of file Added: release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip -- svn:mime-type = application/octet-stream Propchange: release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip -- svn:needs-lock = * Added: release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip.asc == --- release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip.asc (added) +++ release/sling/org.apache.sling.commons.johnzon-1.0.0-source-release.zip.asc Sat Apr 29 08:48:12 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJZAFzZAAoJEM4rf/Z1146Sa8EIAJCVE9x5cO5tBMsaBPNSkXTq +Ht8a1gj44A72sSt7HlE4v37W0JPE0VcpaeZ7WDqoL14yxm4RO1afp3f4HpKyt6jW +HCP0Dw4BSJw7J9q6xv1TXEcCGEUpfQyi0fRhgNw55Jb8aqp4DUcmjsxb79pYp9Ns +RifyJMvZ34/qa32I14ciLmzgdb7sn2xSVEkLu/r2+8n5kZftUpMuXiwDD9ORmE1x +WrbpDu2qgo6f0XCIWrF2phdch9ONlnUkv/ym+dqtWVWcomzHdq14QFAPfBmBYEx0
svn commit: r1793175 - /sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
Author: sseifert Date: Sat Apr 29 08:04:00 2017 New Revision: 1793175 URL: http://svn.apache.org/viewvc?rev=1793175=rev Log: SLING-6812 sling-mock: Lazy initialization of ResourceResolverFactory Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java?rev=1793175=1793174=1793175=diff == --- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java (original) +++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java Sat Apr 29 08:04:00 2017 @@ -208,6 +208,7 @@ public class SlingContextImpl extends Os this.contentBuilder = null; this.resourceBuilder = null; this.uniqueRoot = null; +this.resourceResolverFactory = null; super.tearDown(); }
svn commit: r1793174 - in /sling/trunk/testing/mocks: jcr-mock/pom.xml jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockObservationManager.java sling-mock/pom.xml
Author: sseifert
Date: Sat Apr 29 07:53:37 2017
New Revision: 1793174
URL: http://svn.apache.org/viewvc?rev=1793174=rev
Log:
SLING-6814 jcr-mock: Implement JackrabbitObservationManager
Modified:
sling/trunk/testing/mocks/jcr-mock/pom.xml
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockObservationManager.java
sling/trunk/testing/mocks/sling-mock/pom.xml
Modified: sling/trunk/testing/mocks/jcr-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/pom.xml?rev=1793174=1793173=1793174=diff
==
--- sling/trunk/testing/mocks/jcr-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/jcr-mock/pom.xml Sat Apr 29 07:53:37 2017
@@ -54,6 +54,12 @@
2.8.0
compile
+
+org.apache.jackrabbit
+jackrabbit-api
+2.8.0
+compile
+
com.google.guava
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockObservationManager.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockObservationManager.java?rev=1793174=1793173=1793174=diff
==
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockObservationManager.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockObservationManager.java
Sat Apr 29 07:53:37 2017
@@ -26,10 +26,13 @@ import javax.jcr.observation.EventListen
import javax.jcr.observation.EventListenerIterator;
import javax.jcr.observation.ObservationManager;
+import org.apache.jackrabbit.api.observation.JackrabbitEventFilter;
+import org.apache.jackrabbit.api.observation.JackrabbitObservationManager;
+
/**
* Mock {@link ObservationManager} implementation.
*/
-class MockObservationManager implements ObservationManager {
+class MockObservationManager implements ObservationManager,
JackrabbitObservationManager {
@Override
public void addEventListener(final EventListener listener, final int
eventTypes, final String absPath,
@@ -38,6 +41,11 @@ class MockObservationManager implements
// do nothing
}
+@Override
+public void addEventListener(EventListener listener, JackrabbitEventFilter
filter) throws RepositoryException {
+// do nothing
+}
+
@Override
public void removeEventListener(final EventListener listener) throws
RepositoryException {
// do nothing
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1793174=1793173=1793174=diff
==
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Sat Apr 29 07:53:37 2017
@@ -51,7 +51,7 @@
org.apache.sling
org.apache.sling.testing.jcr-mock
-1.2.0
+1.2.1-SNAPSHOT
compile
svn commit: r1793173 - in /sling/trunk/testing/mocks/sling-mock: ./ src/main/java/org/apache/sling/testing/mock/sling/ src/main/java/org/apache/sling/testing/mock/sling/context/ src/test/java/org/apac
Author: sseifert
Date: Sat Apr 29 07:46:04 2017
New Revision: 1793173
URL: http://svn.apache.org/viewvc?rev=1793173=rev
Log:
SLING-6813 sling-mock: Make compatible with org.apache.sling.jcr.resource 3.0.0
Modified:
sling/trunk/testing/mocks/sling-mock/pom.xml
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1793173=1793172=1793173=diff
==
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Sat Apr 29 07:46:04 2017
@@ -280,7 +280,7 @@
org.apache.sling
org.apache.sling.jcr.resource
-2.9.2
+3.0.1-SNAPSHOT
compile
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java?rev=1793173=1793172=1793173=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
Sat Apr 29 07:46:04 2017
@@ -28,7 +28,6 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProvider;
-import org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper;
import org.apache.sling.resourceresolver.impl.ResourceAccessSecurityTracker;
import org.apache.sling.resourceresolver.impl.ResourceResolverFactoryActivator;
import org.apache.sling.serviceusermapping.ServiceUserMapper;
@@ -84,11 +83,19 @@ class ResourceResolverFactoryInitializer
* Ensure dependencies for JcrResourceProvider are present.
* @param bundleContext Bundle context
*/
+@SuppressWarnings("unchecked")
private static void ensureJcrResourceProviderDependencies(BundleContext
bundleContext) {
if (bundleContext.getServiceReference(DynamicClassLoaderManager.class)
== null) {
bundleContext.registerService(DynamicClassLoaderManager.class, new
MockDynamicClassLoaderManager(), null);
}
-registerServiceIfNotPresent(bundleContext, PathMapper.class, new
PathMapper());
+
+try {
+Class pathMapperClass =
Class.forName("org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper");
+registerServiceIfNotPresent(bundleContext, pathMapperClass,
pathMapperClass.newInstance());
+}
+catch (ClassNotFoundException | InstantiationException |
IllegalAccessException ex) {
+// ignore - service was removed in org.apache.sling.jcr.resource
3.0.0
+}
}
/**
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java?rev=1793173=1793172=1793173=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
Sat Apr 29 07:46:04 2017
@@ -18,8 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.context;
-import static
org.apache.sling.jcr.resource.JcrResourceConstants.NT_SLING_ORDERED_FOLDER;
-
import java.util.UUID;
import org.apache.jackrabbit.JcrConstants;
@@ -81,7 +79,7 @@ public class UniqueRoot {
*/
public final String content() {
if (contentRoot == null) {
-contentRoot = getOrCreateResource("/content/" + uniquePathPart,
NT_SLING_ORDERED_FOLDER);
+contentRoot = getOrCreateResourc
svn commit: r1793172 - in /sling/trunk/testing/mocks/sling-mock/src: main/java/org/apache/sling/testing/mock/sling/ main/java/org/apache/sling/testing/mock/sling/context/ test/java/org/apache/sling/te
Author: sseifert
Date: Sat Apr 29 07:25:35 2017
New Revision: 1793172
URL: http://svn.apache.org/viewvc?rev=1793172=rev
Log:
SLING-6812 sling-mock: Lazy initialization of ResourceResolverFactory
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java?rev=1793172=1793171=1793172=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
Sat Apr 29 07:25:35 2017
@@ -124,6 +124,7 @@ class ResourceResolverFactoryInitializer
Dictionary<String, Object> config = new Hashtable<String, Object>();
// do not required a specific resource provider (otherwise "NONE" will
not work)
config.put("resource.resolver.required.providers", "");
+config.put("resource.resolver.required.providernames", "");
ResourceResolverFactoryActivator activator = new
ResourceResolverFactoryActivator();
MockOsgi.injectServices(activator, bundleContext);
MockOsgi.activate(activator, bundleContext, config);
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java?rev=1793172=1793171=1793172=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
Sat Apr 29 07:25:35 2017
@@ -118,7 +118,6 @@ public class SlingContextImpl extends Os
MockOsgi.setConfigForPid(bundleContext(),
RESOURCERESOLVERFACTORYACTIVATOR_PID,
this.resourceResolverFactoryActivatorProps);
}
-this.resourceResolverFactory = newResourceResolverFactory();
registerDefaultServices();
}
@@ -129,6 +128,13 @@ public class SlingContextImpl extends Os
protected ResourceResolverFactory newResourceResolverFactory() {
return ContextResourceResolverFactory.get(this.resourceResolverType,
bundleContext());
}
+
+private ResourceResolverFactory resourceResolverFactory() {
+if (this.resourceResolverFactory == null) {
+this.resourceResolverFactory = newResourceResolverFactory();
+}
+return this.resourceResolverFactory;
+}
/**
* Default services that should be available for every unit test
@@ -212,7 +218,7 @@ public class SlingContextImpl extends Os
public final ResourceResolverType resourceResolverType() {
return this.resourceResolverType;
}
-
+
/**
* Returns the singleton resource resolver bound to this context.
* It is automatically closed after the test.
@@ -221,7 +227,7 @@ public class SlingContextImpl extends Os
public final ResourceResolver resourceResolver() {
if (this.resourceResolver == null) {
try {
-this.resourceResolver =
this.resourceResolverFactory.getAdministrativeResourceResolver(null);
+this.resourceResolver =
this.resourceResolverFactory().getAdministrativeResourceResolver(null);
} catch (LoginException ex) {
throw new RuntimeException("Creating resource resolver
failed.", ex);
}
Modified:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java?rev=1793172=1793171=1793172=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
(original)
+++
sling/tr
svn commit: r1793113 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Fri Apr 28 15:42:10 2017 New Revision: 1793113 URL: http://svn.apache.org/viewvc?rev=1793113=rev Log: add profile latest-resource-bundles for testing update osgi-mock dependency Modified: sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1793113=1793112=1793113=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Fri Apr 28 15:42:10 2017 @@ -45,7 +45,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.2.4 +2.2.5-SNAPSHOT compile @@ -261,4 +261,42 @@ + + +latest-resource-bundles + + +org.apache.sling +org.apache.sling.api +2.16.2 +compile + + +org.apache.sling +org.apache.sling.resourceresolver +1.5.22 +compile + + +org.apache.sling +org.apache.sling.jcr.resource +2.9.2 +compile + + +org.apache.jackrabbit +jackrabbit-api +2.13.4 +provided + + +org.apache.jackrabbit +oak-jcr +1.5.15 +provided + + + + +
svn commit: r1793112 - in /sling/trunk/testing/mocks/osgi-mock/src: main/java/org/apache/sling/testing/mock/osgi/ test/java/org/apache/sling/testing/mock/osgi/
Author: sseifert
Date: Fri Apr 28 15:37:14 2017
New Revision: 1793112
URL: http://svn.apache.org/viewvc?rev=1793112=rev
Log:
SLING-6811 osgi-mock: Support ServiceFactory and System Bundle
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java?rev=1793112=1793111=1793112=diff
==
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
Fri Apr 28 15:37:14 2017
@@ -31,6 +31,7 @@ import java.util.Vector;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
@@ -46,16 +47,26 @@ public final class MockBundle implements
private final long bundleId;
private final BundleContext bundleContext;
private Map<String, String> headers = ImmutableMap.<String, String>of();
-private String symbolicName = "mock-bundle";
+private String symbolicName;
private long lastModified;
/**
* Constructor
* @param bundleContext Bundle context
+ * @param bundleId Bundle ID
*/
-public MockBundle(BundleContext bundleContext) {
-this.bundleId = ++bundleCounter;
+MockBundle(BundleContext bundleContext, long bundleId) {
+this.bundleId = bundleId;
this.bundleContext = bundleContext;
+this.symbolicName = (bundleId == Constants.SYSTEM_BUNDLE_ID ?
Constants.SYSTEM_BUNDLE_SYMBOLICNAME : "mock-bundle");
+}
+
+/**
+ * Constructor
+ * @param bundleContext Bundle context
+ */
+public MockBundle(BundleContext bundleContext) {
+this(bundleContext, ++bundleCounter);
}
@Override
@@ -174,14 +185,19 @@ public final class MockBundle implements
return queryPath;
}
-// --- unsupported operations ---
@Override
-public Enumeration findEntries(final String path, final String
filePattern, final boolean recurse) {
-throw new UnsupportedOperationException();
+public String getLocation() {
+if (bundleId == Constants.SYSTEM_BUNDLE_ID) {
+return Constants.SYSTEM_BUNDLE_LOCATION;
+}
+else {
+return null;
+}
}
+// --- unsupported operations ---
@Override
-public String getLocation() {
+public Enumeration findEntries(final String path, final String
filePattern, final boolean recurse) {
throw new UnsupportedOperationException();
}
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java?rev=1793112=1793111=1793112=diff
==
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
Fri Apr 28 15:37:14 2017
@@ -43,6 +43,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
+import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.InvalidSyntaxException;
@@ -68,8 +69,11 @@ class MockBundleContext implements Bundl
private final Queue bundleListeners = new
ConcurrentLinkedQueue();
private final ConfigurationAdmin configAdmin = new
MockConfigurationAdmin();
private File dataFileBaseDir;
+
+private final Bundle systemBundle;
public MockBundleContext() {
+this.systemBundle = new MockBundle(this, Constants.SYSTEM_BUNDLE_ID);
this.bundle = new MockBundle(this);
// register configuration admin by default
@@ -120,6 +124,12 @@ class MockBundleContext implements Bundl
return registration;
}
+@SuppressWarn
svn commit: r1792988 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Author: sseifert Date: Fri Apr 28 07:06:25 2017 New Revision: 1792988 URL: http://svn.apache.org/viewvc?rev=1792988=rev Log: SLING-6773 add healthcheck API bundle Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1792988=1792987=1792988=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Fri Apr 28 07:06:25 2017 @@ -48,6 +48,7 @@ org.apache.sling/org.apache.sling.commons.threads/3.2.6 org.apache.sling/org.apache.sling.engine/2.6.7-SNAPSHOT org.apache.sling/org.apache.sling.fsresource/2.0.0 +org.apache.sling/org.apache.sling.hc.api/0.0.99-SNAPSHOT org.apache.sling/org.apache.sling.hc.core/1.2.7-SNAPSHOT org.apache.sling/org.apache.sling.hc.webconsole/1.1.2 org.apache.sling/org.apache.sling.i18n/2.5.8
svn commit: r1792987 - /sling/trunk/bundles/servlets/get/pom.xml
Author: sseifert Date: Fri Apr 28 07:03:17 2017 New Revision: 1792987 URL: http://svn.apache.org/viewvc?rev=1792987=rev Log: SLING-6787 update to latest org.apache.sling.xss snapshot because otherwise it will not run in launchpad Modified: sling/trunk/bundles/servlets/get/pom.xml Modified: sling/trunk/bundles/servlets/get/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/pom.xml?rev=1792987=1792986=1792987=diff == --- sling/trunk/bundles/servlets/get/pom.xml (original) +++ sling/trunk/bundles/servlets/get/pom.xml Fri Apr 28 07:03:17 2017 @@ -86,7 +86,7 @@ org.apache.sling org.apache.sling.xss -1.0.6 +1.0.19-SNAPSHOT provided
svn commit: r1792714 - /sling/trunk/bundles/commons/johnzon/pom.xml
Author: sseifert Date: Wed Apr 26 08:39:38 2017 New Revision: 1792714 URL: http://svn.apache.org/viewvc?rev=1792714=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/commons/johnzon/pom.xml Modified: sling/trunk/bundles/commons/johnzon/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/johnzon/pom.xml?rev=1792714=1792713=1792714=diff == --- sling/trunk/bundles/commons/johnzon/pom.xml (original) +++ sling/trunk/bundles/commons/johnzon/pom.xml Wed Apr 26 08:39:38 2017 @@ -21,15 +21,15 @@ org.apache.sling.commons.johnzon bundle -1.0.0 +1.0.1-SNAPSHOT Apache Johnzon Wrapper Library Apache Johnzon powered javax.json library - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.johnzon-1.0.0 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.johnzon-1.0.0 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.johnzon-1.0.0 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/johnzon + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/johnzon + http://svn.apache.org/viewvc/sling/trunk/bundles/commons/johnzon
svn commit: r1792712 - /sling/trunk/bundles/commons/johnzon/pom.xml
Author: sseifert Date: Wed Apr 26 08:39:23 2017 New Revision: 1792712 URL: http://svn.apache.org/viewvc?rev=1792712=rev Log: [maven-release-plugin] prepare release org.apache.sling.commons.johnzon-1.0.0 Modified: sling/trunk/bundles/commons/johnzon/pom.xml Modified: sling/trunk/bundles/commons/johnzon/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/johnzon/pom.xml?rev=1792712=1792711=1792712=diff == --- sling/trunk/bundles/commons/johnzon/pom.xml (original) +++ sling/trunk/bundles/commons/johnzon/pom.xml Wed Apr 26 08:39:23 2017 @@ -1,75 +1,75 @@ - - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> - -4.0.0 - -org.apache.sling -sling -30 - - - -org.apache.sling.commons.johnzon -bundle -0.1.0-SNAPSHOT - -Apache Johnzon Wrapper Library -Apache Johnzon powered javax.json library - - - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/johnzon - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/johnzon - http://svn.apache.org/viewvc/sling/trunk/bundles/commons/johnzon - - - - - -org.apache.felix -maven-bundle-plugin -true - - - -javax.json.*;-split-package:=first - - org.apache.johnzon.core - - - - - -org.apache.rat -apache-rat-plugin - - - - - - - - - - -org.apache.geronimo.specs -geronimo-json_1.0_spec -1.0-alpha-1 - - -org.apache.johnzon -johnzon-core -1.0.0 -provided - - - + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + +4.0.0 + +org.apache.sling +sling +30 + + + +org.apache.sling.commons.johnzon +bundle +1.0.0 + +Apache Johnzon Wrapper Library +Apache Johnzon powered javax.json library + + + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.johnzon-1.0.0 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.johnzon-1.0.0 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.johnzon-1.0.0 + + + + + +org.apache.felix +maven-bundle-plugin +true + + + +javax.json.*;-split-package:=first + + org.apache.johnzon.core + + + + + +org.apache.rat +apache-rat-plugin + + + + + + + + + + +org.apache.geronimo.specs +geronimo-json_1.0_spec +1.0-alpha-1 + + +org.apache.johnzon +johnzon-core +1.0.0 +provided + + +
svn commit: r1792713 - /sling/tags/org.apache.sling.commons.johnzon-1.0.0/
Author: sseifert Date: Wed Apr 26 08:39:35 2017 New Revision: 1792713 URL: http://svn.apache.org/viewvc?rev=1792713=rev Log: [maven-release-plugin] copy for tag org.apache.sling.commons.johnzon-1.0.0 Added: sling/tags/org.apache.sling.commons.johnzon-1.0.0/ - copied from r1792712, sling/trunk/bundles/commons/johnzon/
svn commit: r1011107 - in /websites/production/sling/content: ./ components/
Author: sseifert Date: Tue Apr 25 09:27:39 2017 New Revision: 1011107 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1011106, websites/staging/sling/trunk/content/ websites/production/sling/content/components/ - copied from r1011106, websites/production/sling/content/components/
svn commit: r1792579 - in /sling/trunk/testing/mocks/caconfig-mock-plugin: pom.xml src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
Author: sseifert
Date: Tue Apr 25 07:47:06 2017
New Revision: 1792579
URL: http://svn.apache.org/viewvc?rev=1792579=rev
Log:
SLING-6789 Support CAConfig Impl 1.4.0
Modified:
sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml
sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
Modified: sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml?rev=1792579=1792578=1792579=diff
==
--- sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml (original)
+++ sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml Tue Apr 25 07:47:06
2017
@@ -53,22 +53,19 @@
org.apache.sling
org.apache.sling.caconfig.api
-
1.1.0
compile
org.apache.sling
org.apache.sling.caconfig.spi
-
-1.2.0
+1.3.0
compile
org.apache.sling
org.apache.sling.caconfig.impl
-
-1.2.0
+1.3.3-SNAPSHOT
compile
Modified:
sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java?rev=1792579=1792578=1792579=diff
==
---
sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
(original)
+++
sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
Tue Apr 25 07:47:06 2017
@@ -104,6 +104,7 @@ public final class ContextPlugins {
* @param context Sling context
*/
private static void registerConfigurationResolver(SlingContextImpl
context) {
+registerByClassName(context,
"org.apache.sling.caconfig.management.impl.ConfigurationManagementSettingsImpl");
if (!registerByClassName(context,
"org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexerImpl"))
{
// fallback to impl 1.2
svn commit: r1792578 - in /sling/trunk/bundles/extensions/caconfig/impl/src: main/java/org/apache/sling/caconfig/impl/def/ main/java/org/apache/sling/caconfig/management/ main/java/org/apache/sling/ca
Author: sseifert Date: Tue Apr 25 07:45:58 2017 New Revision: 1792578 URL: http://svn.apache.org/viewvc?rev=1792578=rev Log: SLING-6788 Context-Aware Config: Make filtered property names for configuration persistence configurable Added: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationManagementSettings.java (with props) sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagementSettingsImpl.java (with props) sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/PropertiesFilterUtil.java (with props) sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagementSettingsImplTest.java (with props) Removed: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PropertiesFilterUtil.java Modified: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/MapUtil.java sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexerImplTest.java sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImplTest.java sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java Modified: sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java?rev=1792578=1792577=1792578=diff == --- sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java (original) +++ sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java Tue Apr 25 07:45:58 2017 @@ -28,8 +28,9 @@ import org.apache.sling.api.resource.Per import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceUtil; +import org.apache.sling.caconfig.management.ConfigurationManagementSettings; +import org.apache.sling.caconfig.management.impl.PropertiesFilterUtil; import org.apache.sling.caconfig.resource.impl.util.MapUtil; -import org.apache.sling.caconfig.resource.impl.util.PropertiesFilterUtil; import org.apache.sling.caconfig.spi.ConfigurationCollectionPersistData; import org.apache.sling.caconfig.spi.ConfigurationPersistData; import org.apache.sling.caconfig.spi.ConfigurationPersistenceAccessDeniedException; @@ -38,6 +39,7 @@ import org.apache.sling.caconfig.spi.Con import org.osgi.service.component.ComponentContext; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.Designate; import org.osgi.service.metatype.annotations.ObjectClassDefinition; @@ -62,6 +64,9 @@ public class DefaultConfigurationPersist boolean enabled() default true; } + +@Reference +private ConfigurationManagementSettings configurationManagementSettings; private volatile Config config; @@ -229,7 +234,7 @@ public class DefaultConfigurationPersist
svn commit: r1009801 - in /websites/production/sling/content: ./ components/
Author: sseifert Date: Tue Apr 4 19:29:51 2017 New Revision: 1009801 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1009800, websites/staging/sling/trunk/content/ websites/production/sling/content/components/ - copied from r1009800, websites/production/sling/content/components/
svn commit: r1790081 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Tue Apr 4 08:59:22 2017 New Revision: 1790081 URL: http://svn.apache.org/viewvc?rev=1790081=rev Log: update dependency Modified: sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1790081=1790080=1790081=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Apr 4 08:59:22 2017 @@ -57,7 +57,7 @@ org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.1.16 +1.1.18 compile
svn commit: r1790080 - /sling/branches/testing/mocks/sling-mock-1.x/pom.xml
Author: sseifert Date: Tue Apr 4 08:58:50 2017 New Revision: 1790080 URL: http://svn.apache.org/viewvc?rev=1790080=rev Log: update dependency Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/pom.xml?rev=1790080=1790079=1790080=diff == --- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Tue Apr 4 08:58:50 2017 @@ -57,7 +57,7 @@ org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.1.16 +1.1.18 compile
svn commit: r19031 - /release/sling/
Author: sseifert Date: Tue Apr 4 07:55:30 2017 New Revision: 19031 Log: Apache Sling Testing ResourceResolver Mock 1.1.18 Added: release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-source-release.zip (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-source-release.zip.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-source-release.zip.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-source-release.zip.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-sources.jar (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-sources.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-sources.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-sources.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18.jar (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18.pom release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18.pom.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18.pom.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18.pom.sha1 Removed: release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-javadoc.jar release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-javadoc.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-javadoc.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-javadoc.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-source-release.zip release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-source-release.zip.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-source-release.zip.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-source-release.zip.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-sources.jar release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-sources.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-sources.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16-sources.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16.jar release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16.pom release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16.pom.asc release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16.pom.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.16.pom.sha1 Added: release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar.asc == --- release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.testing.resourceresolver-mock-1.1.18-javadoc.jar.asc Tue Apr 4 07:55:30 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJY31vAAAoJEM4rf/Z1146S2BkH+wYl8L8lZ3t9v48YUvGzLMWf +ZJPV7mLzfhaOZGQjn4TMjEislHtRGi96llxIC5dKdHozfKShFohEr8LQrGwq8ew2 +hACZ0QGXwz8Ao+oYQnOf52vYMQjf8/LOY1JPs/Vpyo33hgW6lnTV4GQ2VVkFYO6O +y0YXyBRuFrLZsUTVVfuZrLu0lXaI2b0J4eh4w531tjcCbhjQNkLAGx0koe6qZpQB +6bQQOc2MFnQ41eOqGvvIC3x5yUl6aJSL9kBEhovsIkGO4pUIVKqw9mfKYSfQrByT +TbzojxxG/3dBH1OX309Ok1oMtlod9EyzZtPNtpQzC/VDEpP3a2xJxq4C/oJCw9c= +=E+Dw +-END PGP SIGNATURE- Added: release/sling
svn commit: r1790076 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: sseifert Date: Tue Apr 4 07:55:19 2017 New Revision: 1790076 URL: http://svn.apache.org/viewvc?rev=1790076=rev Log: Apache Sling Testing ResourceResolver Mock 1.1.18 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=1790076=1790075=1790076=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Tue Apr 4 07:55:19 2017 @@ -198,7 +198,7 @@ Testing JCR Mock|org.apache.sling.testin Testing Logging Mock|org.apache.sling.testing.logging-mock|2.0.0 Testing OSGi Mock|org.apache.sling.testing.osgi-mock|2.2.4 Testing PaxExam|org.apache.sling.testing.paxexam|0.0.4 -Testing Resource Resolver Mock|org.apache.sling.testing.resourceresolver-mock|1.1.16 +Testing Resource Resolver Mock|org.apache.sling.testing.resourceresolver-mock|1.1.18 Testing Sling Mock|org.apache.sling.testing.sling-mock|2.2.6 Testing Sling Mock Jackrabbit|org.apache.sling.testing.sling-mock-jackrabbit|1.0.0 Testing Sling Mock Oak|org.apache.sling.testing.sling-mock-oak|2.0.2 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1790076=1790075=1790076=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Tue Apr 4 07:55:19 2017 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Testing ResourceResolver Mock 1.1.18 (April 4th, 2017) * New Release: Apache Sling JCR Jackrabbit User Manager 2.2.6 (April 3rd, 2017) * New Releases: Apache Sling Resource Resolver 1.5.22 and Apache Sling Service User Mapper 1.2.6, Apache Sling Testing Sling Mock 2.2.6, Sling Mock 1.9.6, Sling Mock Oak 1.0.2, Context-Aware Configuration Implementation 1.3.2, File System Resource Provider 2.0.0, File System Resource Provider 1.3.0 (March 30th, 2017) * New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.0, Apache Sling Maven Sling Plugin 2.2.0 (March 24th, 2017)
svn commit: r1009728 - in /websites/production/sling/content: ./ components/
Author: sseifert Date: Mon Apr 3 22:33:50 2017 New Revision: 1009728 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1009727, websites/staging/sling/trunk/content/ websites/production/sling/content/components/ - copied from r1009727, websites/production/sling/content/components/
svn commit: r1790055 - /sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.mdtext
Author: sseifert Date: Mon Apr 3 22:32:56 2017 New Revision: 1790055 URL: http://svn.apache.org/viewvc?rev=1790055=rev Log: use ConfigurationPersistenceStrategy2 Modified: sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.mdtext Modified: sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.mdtext?rev=1790055=1790054=1790055=diff == --- sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.mdtext (original) +++ sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.mdtext Mon Apr 3 22:32:56 2017 @@ -41,7 +41,7 @@ By providing an implementation of `org.a # Configuration Persistence Strategy -By providing an implementation of `org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy` you can define the peristence structure of the configuration within the configuration resources. +By providing an implementation of `org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy2` you can define the peristence structure of the configuration within the configuration resources. E.g. you could use a specific JCR node type or slightly different content structure to store the configuration data.
svn commit: r1789776 - /sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.18/
Author: sseifert Date: Sat Apr 1 07:50:02 2017 New Revision: 1789776 URL: http://svn.apache.org/viewvc?rev=1789776=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.resourceresolver-mock-1.1.18 Added: sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.18/ - copied from r1789775, sling/trunk/testing/mocks/resourceresolver-mock/
svn commit: r1789775 - /sling/trunk/testing/mocks/resourceresolver-mock/pom.xml
Author: sseifert Date: Sat Apr 1 07:49:49 2017 New Revision: 1789775 URL: http://svn.apache.org/viewvc?rev=1789775=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.1.18 Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/pom.xml?rev=1789775=1789774=1789775=diff == --- sling/trunk/testing/mocks/resourceresolver-mock/pom.xml (original) +++ sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Sat Apr 1 07:49:49 2017 @@ -28,7 +28,7 @@ org.apache.sling.testing.resourceresolver-mock -1.1.17-SNAPSHOT +1.1.18 Apache Sling Testing Resource Resolver Mock @@ -36,9 +36,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock - http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.18 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.18 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.18
svn commit: r1789777 - /sling/trunk/testing/mocks/resourceresolver-mock/pom.xml
Author: sseifert Date: Sat Apr 1 07:50:04 2017 New Revision: 1789777 URL: http://svn.apache.org/viewvc?rev=1789777=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/pom.xml?rev=1789777=1789776=1789777=diff == --- sling/trunk/testing/mocks/resourceresolver-mock/pom.xml (original) +++ sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Sat Apr 1 07:50:04 2017 @@ -28,7 +28,7 @@ org.apache.sling.testing.resourceresolver-mock -1.1.18 +1.1.19-SNAPSHOT Apache Sling Testing Resource Resolver Mock @@ -36,9 +36,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.18 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.18 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.18 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock + http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock
svn commit: r1789774 - in /sling/trunk/testing/mocks/resourceresolver-mock/src: main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java test/java/org/apache/sling/testing/resourc
Author: sseifert
Date: Sat Apr 1 07:27:59 2017
New Revision: 1789774
URL: http://svn.apache.org/viewvc?rev=1789774=rev
Log:
SLING-6765 resourceresolver-mock: Implement
ResourceResolver.getParentResourceType
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java?rev=1789774=1789773=1789774=diff
==
---
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
(original)
+++
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
Sat Apr 1 07:27:59 2017
@@ -371,6 +371,33 @@ public class MockResourceResolver extend
this.temporaryResources.put(path, props);
}
+@Override
+public String getParentResourceType(Resource resource) {
+String resourceSuperType = null;
+if ( resource != null ) {
+resourceSuperType = resource.getResourceSuperType();
+if (resourceSuperType == null) {
+resourceSuperType =
this.getParentResourceType(resource.getResourceType());
+}
+}
+return resourceSuperType;
+}
+
+@Override
+public String getParentResourceType(String resourceType) {
+// normalize resource type to a path string
+final String rtPath = (resourceType == null ? null :
ResourceUtil.resourceTypeToPath(resourceType));
+// get the resource type resource and check its super type
+String resourceSuperType = null;
+if ( rtPath != null ) {
+final Resource rtResource = getResource(rtPath);
+if (rtResource != null) {
+resourceSuperType = rtResource.getResourceSuperType();
+}
+}
+return resourceSuperType;
+}
+
// part of Resource API 2.6.0
public boolean hasChildren(Resource resource) {
return this.listChildren(resource).hasNext();
@@ -394,16 +421,6 @@ public class MockResourceResolver extend
throw new UnsupportedOperationException();
}
-@Override
-public String getParentResourceType(Resource resource) {
-throw new UnsupportedOperationException();
-}
-
-@Override
-public String getParentResourceType(String resourceType) {
-throw new UnsupportedOperationException();
-}
-
@Override
public Iterator findResources(final String query, final String
language) {
throw new UnsupportedOperationException();
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java?rev=1789774=1789773=1789774=diff
==
---
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
(original)
+++
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
Sat Apr 1 07:27:59 2017
@@ -38,6 +38,7 @@ import org.apache.jackrabbit.util.ISO860
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.NonExistingResource;
+import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
@@ -289,4 +290,21 @@ public class SlingCrudResourceResolverTe
assertEquals("/non/existing/path", resource.getPath());
}
+@Test
+public void testGetParentResourceType() throws PersistenceException {
+Resource r1 = resourceResolver.create(testRoot, "resource1",
ImmutableMap.<String, Object>of());
+Resource r2 = resourceResolver.create(testRoot, "resource2",
ImmutableMap.<String, Object>of(
+"sling:resourceSuperType", testRoot.getPath() + "/resource1"));
+Resource r3 = resourceResolver.create(testRoot, "resource3",
ImmutableMap.<
svn propchange: r1789578 - svn:log
Author: sseifert Revision: 1789578 Modified property: svn:log Modified: svn:log at Thu Mar 30 20:52:51 2017 -- --- svn:log (original) +++ svn:log Thu Mar 30 20:52:51 2017 @@ -1 +1 @@ -SLING-6757 +SLING-6757 Replace commons.json usage in org.apache.sling.testing.tools
svn propchange: r1789581 - svn:log
Author: sseifert Revision: 1789581 Modified property: svn:log Modified: svn:log at Thu Mar 30 20:49:48 2017 -- --- svn:log (original) +++ svn:log Thu Mar 30 20:49:48 2017 @@ -0,0 +1 @@ +SLING-6679 Replace usage of org.apache.sling.commons.json.* and org.json
svn commit: r1789581 - in /sling/trunk/bundles/extensions/caconfig: impl/ impl/src/main/java/org/apache/sling/caconfig/impl/override/ impl/src/test/java/org/apache/sling/caconfig/impl/ impl/src/test/j
Author: sseifert
Date: Thu Mar 30 20:43:05 2017
New Revision: 1789581
URL: http://svn.apache.org/viewvc?rev=1789581=rev
Log: (empty)
Modified:
sling/trunk/bundles/extensions/caconfig/impl/pom.xml
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImplTest.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/override/OverrideStringParserTest.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml
sling/trunk/bundles/extensions/caconfig/integration-tests/src/main/provisioning/integration-tests.txt
Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/pom.xml?rev=1789581=1789580=1789581=diff
==
--- sling/trunk/bundles/extensions/caconfig/impl/pom.xml (original)
+++ sling/trunk/bundles/extensions/caconfig/impl/pom.xml Thu Mar 30 20:43:05
2017
@@ -47,8 +47,10 @@
true
-
+
+ org.apache.sling.xss;version="[1.0.0,3)",
+
!org.apache.sling.commons.osgi,
*
@@ -151,12 +153,6 @@
provided
-org.apache.sling
-org.apache.sling.commons.json
-2.0.10
-compile
-
-
org.apache.commons
commons-lang3
3.3.2
@@ -168,6 +164,12 @@
3.2.1
compile
+
+org.apache.geronimo.specs
+geronimo-json_1.0_spec
+1.0-alpha-1
+provided
+
@@ -224,6 +226,12 @@
2.0.87-beta
test
+
+org.apache.johnzon
+johnzon-core
+1.0.0
+test
+
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java?rev=1789581=1789580=1789581=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java
Thu Mar 30 20:43:05 2017
@@ -18,9 +18,13 @@
*/
package org.apache.sling.caconfig.impl.override;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -28,12 +32,19 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonException;
+import javax.json.JsonNumber;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+import javax.json.JsonReaderFactory;
+import javax.json.JsonString;
+import javax.json.JsonValue;
+
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.caconfig.spi.metadata.PropertyMetadata;
-import org.apache.sling.commons.json.JSONArray;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +63,8 @@ class OverrideStringParser {
private static final Pattern OVERRIDE_PATTERN =
Pattern.compile("^(\\[([^\\[\\]=]+)\\])?([^\\[\\]=]+)=(.*)$");
+private static final JsonReaderFactory JSON_READER_FACTORY =
Json.createReaderFactory(Collections.<String,Object>emptyMap());
+
private OverrideStringParser() {
// static method sonly
}
@@ -81,7 +94,7 @@ class OverrideStringParser {
OverrideItem item;
try {
// check if value is JSON = defines whole parame
svn commit: r1789579 - in /sling/trunk/testing/junit/core: pom.xml src/main/java/org/apache/sling/junit/impl/servlet/JsonRenderer.java
Author: sseifert
Date: Thu Mar 30 20:41:33 2017
New Revision: 1789579
URL: http://svn.apache.org/viewvc?rev=1789579=rev
Log:
SLING-6758 Replace commons.json usage in org.apache.sling.junit.core
Modified:
sling/trunk/testing/junit/core/pom.xml
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/servlet/JsonRenderer.java
Modified: sling/trunk/testing/junit/core/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/junit/core/pom.xml?rev=1789579=1789578=1789579=diff
==
--- sling/trunk/testing/junit/core/pom.xml (original)
+++ sling/trunk/testing/junit/core/pom.xml Thu Mar 30 20:41:33 2017
@@ -136,9 +136,16 @@
provided
-org.apache.sling
-org.apache.sling.commons.json
-2.0.6
+ org.apache.geronimo.specs
+ geronimo-json_1.0_spec
+ 1.0-alpha-1
+ compile
+
+
+ org.apache.johnzon
+ johnzon-core
+ 1.0.0
+ test
javax.servlet
Modified:
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/servlet/JsonRenderer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/servlet/JsonRenderer.java?rev=1789579=1789578=1789579=diff
==
---
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/servlet/JsonRenderer.java
(original)
+++
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/impl/servlet/JsonRenderer.java
Thu Mar 30 20:41:33 2017
@@ -21,12 +21,17 @@ import java.io.UnsupportedEncodingExcept
import java.util.Collection;
import java.util.Map;
+import javax.json.Json;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonBuilderFactory;
+import javax.json.JsonException;
+import javax.json.JsonValue;
+import javax.json.JsonWriter;
+import javax.json.stream.JsonGenerator;
import javax.servlet.http.HttpServletResponse;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.io.JSONWriter;
import org.apache.sling.junit.Renderer;
import org.apache.sling.junit.RendererFactory;
import org.apache.sling.junit.SlingTestContextProvider;
@@ -38,7 +43,7 @@ import org.junit.runner.notification.Run
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/** JSON renderer for JUnit servlet */
+/** Json renderer for JUnit servlet */
@Component(immediate=false)
@Service
public class JsonRenderer extends RunListener implements
Renderer,RendererFactory {
@@ -48,7 +53,7 @@ public class JsonRenderer extends RunLis
public static final String INFO_SUBTYPE_KEY = "INFO_SUBTYPE";
public static final String TEST_METADATA = "test_metadata";
private final Logger log = LoggerFactory.getLogger(getClass());
-private JSONWriter writer;
+private JsonGenerator writer;
public Renderer createRenderer() {
return new JsonRenderer();
@@ -68,11 +73,10 @@ public class JsonRenderer extends RunLis
}
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
-writer = new JSONWriter(response.getWriter());
-writer.setTidy(true);
+writer = Json.createGenerator(response.getWriter());
try {
-writer.array();
-} catch(JSONException jex) {
+writer.writeStartArray();
+} catch(JsonException jex) {
throw (IOException)new IOException().initCause(jex);
}
}
@@ -80,9 +84,9 @@ public class JsonRenderer extends RunLis
public void cleanup() {
if(writer != null) {
try {
-writer.endArray();
-} catch(JSONException jex) {
-log.warn("JSONException in cleanup()", jex);
+writer.writeEnd();
+} catch(JsonException jex) {
+log.warn("JsonException in cleanup()", jex);
}
}
writer = null;
@@ -91,43 +95,42 @@ public class JsonRenderer extends RunLis
public void info(String cssClass, String info) {
try {
startItem("info");
-writer.key(INFO_SUBTYPE_KEY).value(cssClass);
-writer.key("info").value(info);
+writer.write(INFO_SUBTYPE_KEY, cssClass);
+writer.write("info", info);
endItem();
-} catch(JSONException jex) {
-log.warn("JSONException in info()", jex);
+} catch(JsonException jex) {
+log.warn("JsonException in info()", jex);
}
}
public void l
svn commit: r1789578 - in /sling/trunk/testing/tools: pom.xml src/main/java/org/apache/sling/testing/tools/osgi/WebconsoleClient.java
Author: sseifert
Date: Thu Mar 30 20:40:28 2017
New Revision: 1789578
URL: http://svn.apache.org/viewvc?rev=1789578=rev
Log:
SLING-6757
Modified:
sling/trunk/testing/tools/pom.xml
sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/osgi/WebconsoleClient.java
Modified: sling/trunk/testing/tools/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/tools/pom.xml?rev=1789578=1789577=1789578=diff
==
--- sling/trunk/testing/tools/pom.xml (original)
+++ sling/trunk/testing/tools/pom.xml Thu Mar 30 20:40:28 2017
@@ -106,9 +106,16 @@
4.1
-org.apache.sling
-org.apache.sling.commons.json
-2.0.6
+ org.apache.geronimo.specs
+ geronimo-json_1.0_spec
+ 1.0-alpha-1
+ compile
+
+
+ org.apache.johnzon
+ johnzon-core
+ 1.0.0
+ test
javax.servlet
Modified:
sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/osgi/WebconsoleClient.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/osgi/WebconsoleClient.java?rev=1789578=1789577=1789578=diff
==
---
sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/osgi/WebconsoleClient.java
(original)
+++
sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/osgi/WebconsoleClient.java
Thu Mar 30 20:40:28 2017
@@ -19,13 +19,16 @@ package org.apache.sling.testing.tools.o
import static org.junit.Assert.fail;
import java.io.File;
+import java.io.StringReader;
+
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.entity.mime.content.StringBody;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.sling.commons.json.JSONArray;
-import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.testing.tools.http.RequestBuilder;
import org.apache.sling.testing.tools.http.RequestExecutor;
import org.apache.sling.testing.tools.http.RetryingContentChecker;
@@ -108,7 +111,7 @@ public class WebconsoleClient {
new RetryingContentChecker(executor, builder, username,
password).check(path, 200, timeoutSeconds, 500);
}
-private JSONObject getBundleData(String symbolicName) throws Exception {
+private JsonObject getBundleData(String symbolicName) throws Exception {
// This returns a data structure like
// {"status":"Bundle information: 173 bundles in total - all 173
bundles active.","s":[173,171,2,0,0],"data":
// [
@@ -121,16 +124,16 @@ public class WebconsoleClient {
).assertStatus(200)
.getContent();
-final JSONObject root = new JSONObject(content);
-if(!root.has(JSON_KEY_DATA)) {
+final JsonObject root = Json.createReader(new
StringReader(content)).readObject();
+if(!root.containsKey(JSON_KEY_DATA)) {
fail(path + " does not provide '" + JSON_KEY_DATA + "' element,
JSON content=" + content);
}
-final JSONArray data = root.getJSONArray(JSON_KEY_DATA);
-if(data.length() < 1) {
+final JsonArray data = root.getJsonArray(JSON_KEY_DATA);
+if(data.size() < 1) {
fail(path + "." + JSON_KEY_DATA + " is empty, JSON content=" +
content);
}
-final JSONObject bundle = data.getJSONObject(0);
-if(!bundle.has(JSON_KEY_STATE)) {
+final JsonObject bundle = data.getJsonObject(0);
+if(!bundle.containsKey(JSON_KEY_STATE)) {
fail(path + ".data[0].state missing, JSON content=" + content);
}
return bundle;
@@ -138,19 +141,19 @@ public class WebconsoleClient {
/** Get bundle id */
public long getBundleId(String symbolicName) throws Exception {
-final JSONObject bundle = getBundleData(symbolicName);
-return bundle.getLong(JSON_KEY_ID);
+final JsonObject bundle = getBundleData(symbolicName);
+return bundle.getJsonNumber(JSON_KEY_ID).longValue();
}
/** Get bundle version **/
public String getBundleVersion(String symbolicName) throws Exception {
-final JSONObject bundle = getBundleData(symbolicName);
+final JsonObject bundle = getBundleData(symbolicName);
return bundle.getString(JSON_KEY_VERSION);
}
/** Get specified bundle state */
public String getBundleState(String symbolicName) throws Exception {
-final JSONObject bundle = getBundleData(symbolicName);
+final JsonObject bundle = getBundleData(symbolicName);
return bundle.getString(JSON_KEY_STATE);
}
svn commit: r1789561 - /sling/trunk/testing/junit/teleporter/pom.xml
Author: sseifert Date: Thu Mar 30 19:50:59 2017 New Revision: 1789561 URL: http://svn.apache.org/viewvc?rev=1789561=rev Log: cosmetic: make sure johnzon is references in test scope Modified: sling/trunk/testing/junit/teleporter/pom.xml Modified: sling/trunk/testing/junit/teleporter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/teleporter/pom.xml?rev=1789561=1789560=1789561=diff == --- sling/trunk/testing/junit/teleporter/pom.xml (original) +++ sling/trunk/testing/junit/teleporter/pom.xml Thu Mar 30 19:50:59 2017 @@ -89,12 +89,14 @@ org.apache.johnzon johnzon-core 1.0.0 + test org.apache.geronimo.specs geronimo-json_1.0_spec 1.0-alpha-1 + compile commons-io
svn commit: r1789557 - in /sling/trunk/bundles/extensions/caconfig: impl/pom.xml spi/pom.xml
Author: sseifert Date: Thu Mar 30 19:40:58 2017 New Revision: 1789557 URL: http://svn.apache.org/viewvc?rev=1789557=rev Log: update sling-mock dependency Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml sling/trunk/bundles/extensions/caconfig/spi/pom.xml Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/pom.xml?rev=1789557=1789556=1789557=diff == --- sling/trunk/bundles/extensions/caconfig/impl/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/impl/pom.xml Thu Mar 30 19:40:58 2017 @@ -199,7 +199,7 @@ org.apache.sling org.apache.sling.testing.sling-mock -1.9.0 +1.9.6 test Modified: sling/trunk/bundles/extensions/caconfig/spi/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/spi/pom.xml?rev=1789557=1789556=1789557=diff == --- sling/trunk/bundles/extensions/caconfig/spi/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/spi/pom.xml Thu Mar 30 19:40:58 2017 @@ -87,7 +87,7 @@ org.apache.sling org.apache.sling.testing.sling-mock -1.9.0 +1.9.6 test
svn commit: r1009403 - in /websites/production/sling/content: ./ components/
Author: sseifert Date: Thu Mar 30 19:39:38 2017 New Revision: 1009403 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1009402, websites/staging/sling/trunk/content/ websites/production/sling/content/components/ - copied from r1009402, websites/production/sling/content/components/
svn commit: r1789556 - /sling/site/trunk/content/downloads.list
Author: sseifert Date: Thu Mar 30 19:38:55 2017 New Revision: 1789556 URL: http://svn.apache.org/viewvc?rev=1789556=rev Log: change name to File System Resource Provider Modified: sling/site/trunk/content/downloads.list Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1789556=1789555=1789556=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Thu Mar 30 19:38:55 2017 @@ -80,7 +80,7 @@ Explorer|org.apache.sling.extensions.exp Feature Flags|org.apache.sling.featureflags|1.2.0 GWT Integration|org.apache.sling.gwt.servlet|3.0.0 Thread Dumper|org.apache.sling.extensions.threaddump|0.2.2 -FileSystem Provider|org.apache.sling.fsresource|2.0.0 +File System Resource Provider|org.apache.sling.fsresource|2.0.0 I18n|org.apache.sling.i18n|2.5.8 HApi|org.apache.sling.api|1.0.0 Health Check Annotations|org.apache.sling.hc.annotations|1.0.4
svn commit: r1009401 - in /websites/production/sling/content: ./ components/
Author: sseifert Date: Thu Mar 30 19:37:29 2017 New Revision: 1009401 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1009400, websites/staging/sling/trunk/content/ websites/production/sling/content/components/ - copied from r1009400, websites/production/sling/content/components/
svn commit: r1789555 - /sling/trunk/bundles/extensions/fsresource/pom.xml
Author: sseifert Date: Thu Mar 30 19:32:23 2017 New Revision: 1789555 URL: http://svn.apache.org/viewvc?rev=1789555=rev Log: update sling-mock dependency Modified: sling/trunk/bundles/extensions/fsresource/pom.xml Modified: sling/trunk/bundles/extensions/fsresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1789555=1789554=1789555=diff == --- sling/trunk/bundles/extensions/fsresource/pom.xml (original) +++ sling/trunk/bundles/extensions/fsresource/pom.xml Thu Mar 30 19:32:23 2017 @@ -157,7 +157,7 @@ org.apache.sling org.apache.sling.testing.sling-mock -2.2.4 +2.2.6 test
svn commit: r1789554 - /sling/branches/fsresource-1.x/pom.xml
Author: sseifert Date: Thu Mar 30 19:31:57 2017 New Revision: 1789554 URL: http://svn.apache.org/viewvc?rev=1789554=rev Log: update sling-mock dependency Modified: sling/branches/fsresource-1.x/pom.xml Modified: sling/branches/fsresource-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1789554=1789553=1789554=diff == --- sling/branches/fsresource-1.x/pom.xml (original) +++ sling/branches/fsresource-1.x/pom.xml Thu Mar 30 19:31:57 2017 @@ -159,7 +159,7 @@ org.apache.sling org.apache.sling.testing.sling-mock -1.9.4 +1.9.6 test
svn commit: r1789553 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Author: sseifert Date: Thu Mar 30 19:31:11 2017 New Revision: 1789553 URL: http://svn.apache.org/viewvc?rev=1789553=rev Log: update fsresource Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1789553=1789552=1789553=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Thu Mar 30 19:31:11 2017 @@ -47,7 +47,7 @@ org.apache.sling/org.apache.sling.commons.scheduler/2.5.2 org.apache.sling/org.apache.sling.commons.threads/3.2.6 org.apache.sling/org.apache.sling.engine/2.6.7-SNAPSHOT -org.apache.sling/org.apache.sling.fsresource/1.2.2 +org.apache.sling/org.apache.sling.fsresource/2.0.0 org.apache.sling/org.apache.sling.hc.core/1.2.7-SNAPSHOT org.apache.sling/org.apache.sling.hc.webconsole/1.1.2 org.apache.sling/org.apache.sling.i18n/2.5.8
svn commit: r1789543 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: sseifert Date: Thu Mar 30 17:59:06 2017 New Revision: 1789543 URL: http://svn.apache.org/viewvc?rev=1789543=rev Log: Apache Sling Testing Sling Mock 2.2.6, Sling Mock 1.9.6, Sling Mock Oak 1.0.2, Context-Aware Configuration Implementation 1.3.2, File System Resource Provider 2.0.0, File System Resource Provider 1.3.0 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1789543=1789542=1789543=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Thu Mar 30 17:59:06 2017 @@ -51,7 +51,7 @@ Commons Threads|org.apache.sling.commons Content Detection Support|org.apache.sling.commons.contentdetection|1.0.2 Context-Aware Configuration API|org.apache.sling.caconfig.api|1.1.0 Context-Aware Configuration bnd Plugin|org.apache.sling.caconfig.bnd-plugin|1.0.2 -Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.3.0 +Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.3.2 Context-Aware Configuration Mock Plugin|org.apache.sling.testing.caconfig-mock-plugin|1.1.0 Context-Aware Configuration SPI|org.apache.sling.caconfig.spi|1.3.0 Crankstart API|org.apache.sling.crankstart.api|1.0.0 @@ -80,7 +80,7 @@ Explorer|org.apache.sling.extensions.exp Feature Flags|org.apache.sling.featureflags|1.2.0 GWT Integration|org.apache.sling.gwt.servlet|3.0.0 Thread Dumper|org.apache.sling.extensions.threaddump|0.2.2 -FileSystem Provider|org.apache.sling.fsresource|1.2.2 +FileSystem Provider|org.apache.sling.fsresource|2.0.0 I18n|org.apache.sling.i18n|2.5.8 HApi|org.apache.sling.api|1.0.0 Health Check Annotations|org.apache.sling.hc.annotations|1.0.4 @@ -199,7 +199,7 @@ Testing Logging Mock|org.apache.sling.te Testing OSGi Mock|org.apache.sling.testing.osgi-mock|2.2.4 Testing PaxExam|org.apache.sling.testing.paxexam|0.0.4 Testing Resource Resolver Mock|org.apache.sling.testing.resourceresolver-mock|1.1.16 -Testing Sling Mock|org.apache.sling.testing.sling-mock|2.2.4 +Testing Sling Mock|org.apache.sling.testing.sling-mock|2.2.6 Testing Sling Mock Jackrabbit|org.apache.sling.testing.sling-mock-jackrabbit|1.0.0 Testing Sling Mock Oak|org.apache.sling.testing.sling-mock-oak|2.0.2 Tooling Support Install|org.apache.sling.tooling.support.install|1.0.2 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1789543=1789542=1789543=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Thu Mar 30 17:59:06 2017 @@ -1,6 +1,6 @@ Title: News -* New Releases: Apache Sling Resource Resolver 1.5.22 and Apache Sling Service User Mapper 1.2.6 (March 30th, 2017) +* New Releases: Apache Sling Resource Resolver 1.5.22 and Apache Sling Service User Mapper 1.2.6, Apache Sling Testing Sling Mock 2.2.6, Sling Mock 1.9.6, Sling Mock Oak 1.0.2, Context-Aware Configuration Implementation 1.3.2, File System Resource Provider 2.0.0, File System Resource Provider 1.3.0 (March 30th, 2017) * New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.0, Apache Sling Maven Sling Plugin 2.2.0 (March 24th, 2017) * New Releases: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 2.2.4, Testing OSGi Mock 1.9.4 (March 23th, 2017) * New Releases: Apache Sling Commons JSON 2.0.20, Apache Sling Karaf repoinit 0.2.0, Apache Sling Scripting JSP API Wrapper 1.0.0, Apache Sling Scripting JSP EL Wrapper 1.0.0, Apache Sling Scripting JSP 2.3.0, Apache Sling Testing PaxExam 0.0.4, Apache Sling JCR Oak Server 1.1.4, Apache Sling Scripting Thymeleaf 1.1.0, Apache Sling Resource Presence 0.0.2 (March 20th, 2017)
svn commit: r18973 - /release/sling/
Author: sseifert Date: Thu Mar 30 17:10:44 2017 New Revision: 18973 Log: Apache Sling File System Resource Provider 2.0.0, File System Resource Provider 1.3.0 Added: release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar (with props) release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.asc release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.md5 release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.sha1 release/sling/org.apache.sling.fsresource-2.0.0-source-release.zip (with props) release/sling/org.apache.sling.fsresource-2.0.0-source-release.zip.asc release/sling/org.apache.sling.fsresource-2.0.0-source-release.zip.md5 release/sling/org.apache.sling.fsresource-2.0.0-source-release.zip.sha1 release/sling/org.apache.sling.fsresource-2.0.0-sources.jar (with props) release/sling/org.apache.sling.fsresource-2.0.0-sources.jar.asc release/sling/org.apache.sling.fsresource-2.0.0-sources.jar.md5 release/sling/org.apache.sling.fsresource-2.0.0-sources.jar.sha1 release/sling/org.apache.sling.fsresource-2.0.0.jar (with props) release/sling/org.apache.sling.fsresource-2.0.0.jar.asc release/sling/org.apache.sling.fsresource-2.0.0.jar.md5 release/sling/org.apache.sling.fsresource-2.0.0.jar.sha1 release/sling/org.apache.sling.fsresource-2.0.0.pom release/sling/org.apache.sling.fsresource-2.0.0.pom.asc release/sling/org.apache.sling.fsresource-2.0.0.pom.md5 release/sling/org.apache.sling.fsresource-2.0.0.pom.sha1 Removed: release/sling/org.apache.sling.fsresource-1.2.2-javadoc.jar release/sling/org.apache.sling.fsresource-1.2.2-javadoc.jar.asc release/sling/org.apache.sling.fsresource-1.2.2-javadoc.jar.md5 release/sling/org.apache.sling.fsresource-1.2.2-javadoc.jar.sha1 release/sling/org.apache.sling.fsresource-1.2.2-source-release.zip release/sling/org.apache.sling.fsresource-1.2.2-source-release.zip.asc release/sling/org.apache.sling.fsresource-1.2.2-source-release.zip.md5 release/sling/org.apache.sling.fsresource-1.2.2-source-release.zip.sha1 release/sling/org.apache.sling.fsresource-1.2.2-sources.jar release/sling/org.apache.sling.fsresource-1.2.2-sources.jar.asc release/sling/org.apache.sling.fsresource-1.2.2-sources.jar.md5 release/sling/org.apache.sling.fsresource-1.2.2-sources.jar.sha1 release/sling/org.apache.sling.fsresource-1.2.2.jar release/sling/org.apache.sling.fsresource-1.2.2.jar.asc release/sling/org.apache.sling.fsresource-1.2.2.jar.md5 release/sling/org.apache.sling.fsresource-1.2.2.jar.sha1 release/sling/org.apache.sling.fsresource-1.2.2.pom release/sling/org.apache.sling.fsresource-1.2.2.pom.asc release/sling/org.apache.sling.fsresource-1.2.2.pom.md5 release/sling/org.apache.sling.fsresource-1.2.2.pom.sha1 Added: release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.asc == --- release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.asc Thu Mar 30 17:10:44 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJY2Tq5AAoJEM4rf/Z1146Ss/8IAILXI4nnn9gnD0n92+ku/BoH +DSYREcjKkUOA1SrItIswhx/mDJN8c+Q3F3+L0RcavrJBjcU0YIHajrLdI5oy+qnC +cTlvjPbGVWA7sa+t8mZYX0UWyJCbrEa9rEEyS3DRH/VPPGez7U9JtXK6Itx8X/gI +bYH1f43p2hUqvDS1NbLvRzodD2bNlVw194c7Zpr468nbFbm57Ec4Oqm9l/hSsBnl +3w03xI9r3H9Z55xU61WoAzitxz0OpbLgsUJY/VndCJf6OyrMbzPSBgNXoHjM3OfO +jtYxJ1YofMPIyuC6DXpKwTfIj5QiNe2Xi8y6RtAP9grtFx/dgg4hKNSatRMWr1M= +=FoNa +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.md5 == --- release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.md5 Thu Mar 30 17:10:44 2017 @@ -0,0 +1 @@ +2beaa103c16787e9e4400bef9afdc337 \ No newline at end of file Added: release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.sha1 == --- release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.fsresource-2.0.0-javadoc.jar.sha1 Thu Mar 30 17:10:44 2017 @@ -0,0 +1 @@ +4175e52f4ddaba7dfbf5295f73ad7605e3beff8b \ No newline at end of file Added: release/sling/org.apache.sling.fsresource-2.0.0-source-release.zip
svn commit: r18972 - /release/sling/
Author: sseifert Date: Thu Mar 30 17:09:57 2017 New Revision: 18972 Log: Apache Sling CAConfig Impl 1.3.2 Added: release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.2-source-release.zip (with props) release/sling/org.apache.sling.caconfig.impl-1.3.2-source-release.zip.asc release/sling/org.apache.sling.caconfig.impl-1.3.2-source-release.zip.md5 release/sling/org.apache.sling.caconfig.impl-1.3.2-source-release.zip.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.2-sources.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.3.2-sources.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.2-sources.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.2-sources.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.2.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.3.2.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.2.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.2.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.2.pom release/sling/org.apache.sling.caconfig.impl-1.3.2.pom.asc release/sling/org.apache.sling.caconfig.impl-1.3.2.pom.md5 release/sling/org.apache.sling.caconfig.impl-1.3.2.pom.sha1 Removed: release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.asc release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.0.jar release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.0.pom release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.asc release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.sha1 Added: release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.asc == --- release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.asc Thu Mar 30 17:09:57 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJY2TL4AAoJEM4rf/Z1146SL2UH+gJsRR2Q09erK1U1reY2gNvD +6NTwPhz9AYH5YIPURBQMgf0hOl2UfKAqK031BllsDRp0Ymssfar3LBtr6ydngs8A +gcRoIzWQGfOQrDSrKzNqom+lLGSQ3+u9LVmU7w+UAX9920FXhr53g/bnnU749FBd +PDlmiPyKb5iiS+/6vqf3vKeN6sn8cNtg9ScOL+p068OSLmx1PAZT4rANO1ywX2ow +2AnSi/HQyuUAXZWXQLTOXPzh8Usb6S+WH6XIBOE5Xj54QVdFKIa5bPAOuD9+JrPD +RL/57CcJW1DXZqfX2HnNO9fD4S+OnrBLC0U4ABEfVOB9ntgrpLKfFkj/5Y3c+e8= +=et9h +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.md5 == --- release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.md5 Thu Mar 30 17:09:57 2017 @@ -0,0 +1 @@ +eb3c8090ed91c7f143f952e09c997f2c \ No newline at end of file Added: release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.sha1 == --- release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.caconfig.impl-1.3.2-javadoc.jar.sha1 Thu Mar 30 17:09:57 2017 @@ -0,0 +1 @@ +89af6630cf0ec2d56a80b0b711429923b1ee0db7 \ No newline at end of file Added: release/sling
svn commit: r1789357 - /sling/trunk/parent/pom.xml
Author: sseifert Date: Wed Mar 29 12:58:17 2017 New Revision: 1789357 URL: http://svn.apache.org/viewvc?rev=1789357=rev Log: SLING-6746 Remove and ban maven-scr-plugin Modified: sling/trunk/parent/pom.xml Modified: sling/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1789357=1789356=1789357=diff == --- sling/trunk/parent/pom.xml (original) +++ sling/trunk/parent/pom.xml Wed Mar 29 12:58:17 2017 @@ -147,6 +147,22 @@ + +ban-maven-scr-plugin + +enforce + + + + + + org.apache.felix:maven-scr-plugin + +Felix SCR annotations and the maven-scr-plugin are no longer supported - please migrate to OSGi annotations or stick with Sling Parent 29. + + + + @@ -358,38 +374,6 @@ org.apache.felix -maven-scr-plugin -1.23.0 - - - -org.slf4j -slf4j-simple -1.7.6 - - - - -generate-scr-scrdescriptor - -scr - - -true - -The Apache Software Foundation - - - - - - -org.apache.felix maven-bundle-plugin 3.3.0 true
svn commit: r1788976 - /sling/branches/fsresource-1.x/pom.xml
Author: sseifert Date: Mon Mar 27 16:17:14 2017 New Revision: 1788976 URL: http://svn.apache.org/viewvc?rev=1788976=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/branches/fsresource-1.x/pom.xml Modified: sling/branches/fsresource-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1788976=1788975=1788976=diff == --- sling/branches/fsresource-1.x/pom.xml (original) +++ sling/branches/fsresource-1.x/pom.xml Mon Mar 27 16:17:14 2017 @@ -28,7 +28,7 @@ org.apache.sling.fsresource bundle -1.3.0 +1.3.1-SNAPSHOT Apache Sling File System Resource Provider @@ -36,9 +36,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.3.0 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.3.0 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.3.0 + scm:svn:http://svn.apache.org/repos/asf/sling/branches/fsresource-1.x + scm:svn:https://svn.apache.org/repos/asf/sling/branches/fsresource-1.x +http://svn.apache.org/viewvc/sling/branches/fsresource-1.x
svn commit: r1788975 - /sling/tags/org.apache.sling.fsresource-1.3.0/
Author: sseifert Date: Mon Mar 27 16:17:12 2017 New Revision: 1788975 URL: http://svn.apache.org/viewvc?rev=1788975=rev Log: [maven-release-plugin] copy for tag org.apache.sling.fsresource-1.3.0 Added: sling/tags/org.apache.sling.fsresource-1.3.0/ - copied from r1788974, sling/branches/fsresource-1.x/
svn commit: r1788974 - /sling/branches/fsresource-1.x/pom.xml
Author: sseifert Date: Mon Mar 27 16:16:59 2017 New Revision: 1788974 URL: http://svn.apache.org/viewvc?rev=1788974=rev Log: [maven-release-plugin] prepare release org.apache.sling.fsresource-1.3.0 Modified: sling/branches/fsresource-1.x/pom.xml Modified: sling/branches/fsresource-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1788974=1788973=1788974=diff == --- sling/branches/fsresource-1.x/pom.xml (original) +++ sling/branches/fsresource-1.x/pom.xml Mon Mar 27 16:16:59 2017 @@ -28,7 +28,7 @@ org.apache.sling.fsresource bundle -1.3.0-SNAPSHOT +1.3.0 Apache Sling File System Resource Provider @@ -36,9 +36,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/branches/fsresource-1.x - scm:svn:https://svn.apache.org/repos/asf/sling/branches/fsresource-1.x -http://svn.apache.org/viewvc/sling/branches/fsresource-1.x + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.3.0 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.3.0 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.3.0
svn commit: r1788973 - /sling/trunk/bundles/extensions/fsresource/pom.xml
Author: sseifert Date: Mon Mar 27 16:15:25 2017 New Revision: 1788973 URL: http://svn.apache.org/viewvc?rev=1788973=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/fsresource/pom.xml Modified: sling/trunk/bundles/extensions/fsresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1788973=1788972=1788973=diff == --- sling/trunk/bundles/extensions/fsresource/pom.xml (original) +++ sling/trunk/bundles/extensions/fsresource/pom.xml Mon Mar 27 16:15:25 2017 @@ -28,7 +28,7 @@ org.apache.sling.fsresource bundle -2.0.0 +2.0.1-SNAPSHOT Apache Sling File System Resource Provider @@ -36,9 +36,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-2.0.0 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-2.0.0 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-2.0.0 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource + http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource
svn commit: r1788971 - /sling/trunk/bundles/extensions/fsresource/pom.xml
Author: sseifert Date: Mon Mar 27 16:15:10 2017 New Revision: 1788971 URL: http://svn.apache.org/viewvc?rev=1788971=rev Log: [maven-release-plugin] prepare release org.apache.sling.fsresource-2.0.0 Modified: sling/trunk/bundles/extensions/fsresource/pom.xml Modified: sling/trunk/bundles/extensions/fsresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1788971=1788970=1788971=diff == --- sling/trunk/bundles/extensions/fsresource/pom.xml (original) +++ sling/trunk/bundles/extensions/fsresource/pom.xml Mon Mar 27 16:15:10 2017 @@ -28,7 +28,7 @@ org.apache.sling.fsresource bundle -2.0.0-SNAPSHOT +2.0.0 Apache Sling File System Resource Provider @@ -36,9 +36,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource - http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-2.0.0 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-2.0.0 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-2.0.0
svn commit: r1788972 - /sling/tags/org.apache.sling.fsresource-2.0.0/
Author: sseifert Date: Mon Mar 27 16:15:23 2017 New Revision: 1788972 URL: http://svn.apache.org/viewvc?rev=1788972=rev Log: [maven-release-plugin] copy for tag org.apache.sling.fsresource-2.0.0 Added: sling/tags/org.apache.sling.fsresource-2.0.0/ - copied from r1788971, sling/trunk/bundles/extensions/fsresource/
svn commit: r1788968 - in /sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal: FileMonitor.java FsResourceProvider.java mapper/FileResource.java
Author: sseifert
Date: Mon Mar 27 16:14:33 2017
New Revision: 1788968
URL: http://svn.apache.org/viewvc?rev=1788968=rev
Log:
fix javadoc errors
Modified:
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileResource.java
Modified:
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
URL:
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java?rev=1788968=1788967=1788968=diff
==
---
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
(original)
+++
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
Mon Mar 27 16:14:33 2017
@@ -68,6 +68,9 @@ public final class FileMonitor extends T
* Creates a new instance of this class.
* @param provider The resource provider.
* @param interval The interval between executions of the task, in
milliseconds.
+ * @param fsMode FS mode
+ * @param contentFileExtensions Content file extensions
+ * @param contentFileCache Content file cache
*/
public FileMonitor(final FsResourceProvider provider, final long interval,
FsMode fsMode,
final ContentFileExtensions contentFileExtensions, final
ContentFileCache contentFileCache) {
Modified:
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=1788968=1788967=1788968=diff
==
---
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
(original)
+++
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
Mon Mar 27 16:14:33 2017
@@ -77,7 +77,8 @@ import org.osgi.service.metatype.annotat
public final class FsResourceProvider implements ResourceProvider {
/**
- * Resource metadata property set by {@link FsResource} if the underlying
file reference is a directory.
+ * Resource metadata property set by {@link
org.apache.sling.fsprovider.internal.mapper.FileResource}
+ * if the underlying file reference is a directory.
*/
public static final String RESOURCE_METADATA_FILE_DIRECTORY =
":org.apache.sling.fsprovider.file.directory";
@@ -130,9 +131,7 @@ public final class FsResourceProvider im
description = "Max. number of content files cached in memory.")
int provider_cache_size() default 1;
-/**
- * Internal Name hint for web console.
- */
+// Internal Name hint for web console.
String webconsole_configurationFactory_nameHint() default
"{provider.fs.mode}: {" + ResourceProvider.ROOTS + "}";
}
Modified:
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileResource.java
URL:
http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileResource.java?rev=1788968=1788967=1788968=diff
==
---
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileResource.java
(original)
+++
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/mapper/FileResource.java
Mon Mar 27 16:14:33 2017
@@ -53,13 +53,13 @@ public final class FileResource extends
/**
* The resource type for file system files mapped into the resource tree by
- * the {@link FsResourceProvider} (value is "nt:file").
+ * the {@link org.apache.sling.fsprovider.internal.FsResourceProvider}
(value is "nt:file").
*/
public static final String RESOURCE_TYPE_FILE = "nt:file";
/**
* The resource type for file system folders mapped into the resource tree
- * by the {@link FsResourceProvider} (value is "nt:folder").
+ * by the {@link org.apache.sling.fsprovider.internal.FsResourceProvider}
(value is "nt:folder").
*/
public static final String RESOURCE_TYPE_FOLDER = "nt:folder";
svn commit: r1788967 - in /sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal: FileMonitor.java FsResourceProvider.java
Author: sseifert
Date: Mon Mar 27 16:11:51 2017
New Revision: 1788967
URL: http://svn.apache.org/viewvc?rev=1788967=rev
Log:
fix javadoc errors
Modified:
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
Modified:
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java?rev=1788967=1788966=1788967=diff
==
---
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
(original)
+++
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
Mon Mar 27 16:11:51 2017
@@ -60,6 +60,9 @@ public final class FileMonitor extends T
* Creates a new instance of this class.
* @param provider The resource provider.
* @param interval The interval between executions of the task, in
milliseconds.
+ * @param fsMode FS mode
+ * @param contentFileExtensions Content file extensions
+ * @param contentFileCache Content file cache
*/
public FileMonitor(final FsResourceProvider provider, final long interval,
FsMode fsMode,
final ContentFileExtensions contentFileExtensions, final
ContentFileCache contentFileCache) {
Modified:
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=1788967=1788966=1788967=diff
==
---
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
(original)
+++
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
Mon Mar 27 16:11:51 2017
@@ -75,7 +75,8 @@ import org.osgi.service.metatype.annotat
public final class FsResourceProvider extends ResourceProvider {
/**
- * Resource metadata property set by {@link FsResource} if the underlying
file reference is a directory.
+ * Resource metadata property set by {@link
org.apache.sling.fsprovider.internal.mapper.FileResource}
+ * if the underlying file reference is a directory.
*/
public static final String RESOURCE_METADATA_FILE_DIRECTORY =
":org.apache.sling.fsprovider.file.directory";
@@ -128,9 +129,7 @@ public final class FsResourceProvider ex
description = "Max. number of content files cached in memory.")
int provider_cache_size() default 1;
-/**
- * Internal Name hint for web console.
- */
+// Internal Name hint for web console.
String webconsole_configurationFactory_nameHint() default
"{provider.fs.mode}: {" + ResourceProvider.PROPERTY_ROOT + "}";
}
svn commit: r1788964 - /sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml
Author: sseifert Date: Mon Mar 27 15:48:23 2017 New Revision: 1788964 URL: http://svn.apache.org/viewvc?rev=1788964=rev Log: update dependency Modified: sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml Modified: sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml?rev=1788964=1788963=1788964=diff == --- sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml Mon Mar 27 15:48:23 2017 @@ -157,7 +157,7 @@ org.apache.sling org.apache.sling.caconfig.impl -1.3.1-SNAPSHOT +1.3.3-SNAPSHOT provided
svn commit: r1788960 - /sling/tags/org.apache.sling.caconfig.impl-1.3.2/
Author: sseifert Date: Mon Mar 27 15:42:20 2017 New Revision: 1788960 URL: http://svn.apache.org/viewvc?rev=1788960=rev Log: [maven-release-plugin] copy for tag org.apache.sling.caconfig.impl-1.3.2 Added: sling/tags/org.apache.sling.caconfig.impl-1.3.2/ - copied from r1788959, sling/trunk/bundles/extensions/caconfig/impl/
svn commit: r1788961 - /sling/trunk/bundles/extensions/caconfig/impl/pom.xml
Author: sseifert Date: Mon Mar 27 15:42:22 2017 New Revision: 1788961 URL: http://svn.apache.org/viewvc?rev=1788961=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/pom.xml?rev=1788961=1788960=1788961=diff == --- sling/trunk/bundles/extensions/caconfig/impl/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/impl/pom.xml Mon Mar 27 15:42:22 2017 @@ -29,14 +29,14 @@ org.apache.sling.caconfig.impl bundle -1.3.2 +1.3.3-SNAPSHOT Apache Sling Context-Aware Configuration Implementation Apache Sling Context-Aware Configuration Implementation - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.caconfig.impl-1.3.2 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.caconfig.impl-1.3.2 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.caconfig.impl-1.3.2 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/caconfig/impl + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/caconfig/impl + http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl
svn commit: r1788959 - /sling/trunk/bundles/extensions/caconfig/impl/pom.xml
Author: sseifert Date: Mon Mar 27 15:42:06 2017 New Revision: 1788959 URL: http://svn.apache.org/viewvc?rev=1788959=rev Log: [maven-release-plugin] prepare release org.apache.sling.caconfig.impl-1.3.2 Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/pom.xml?rev=1788959=1788958=1788959=diff == --- sling/trunk/bundles/extensions/caconfig/impl/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/impl/pom.xml Mon Mar 27 15:42:06 2017 @@ -29,14 +29,14 @@ org.apache.sling.caconfig.impl bundle -1.3.1-SNAPSHOT +1.3.2 Apache Sling Context-Aware Configuration Implementation Apache Sling Context-Aware Configuration Implementation - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/caconfig/impl - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/caconfig/impl - http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.caconfig.impl-1.3.2 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.caconfig.impl-1.3.2 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.caconfig.impl-1.3.2
svn commit: r1788956 - /sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml
Author: sseifert Date: Mon Mar 27 15:30:08 2017 New Revision: 1788956 URL: http://svn.apache.org/viewvc?rev=1788956=rev Log: update dependency Modified: sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml Modified: sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml?rev=1788956=1788955=1788956=diff == --- sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml Mon Mar 27 15:30:08 2017 @@ -37,7 +37,7 @@ 1.2.2 2.10.1 -1.9.6 +1.9.7-SNAPSHOT
svn commit: r1788955 - /sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml
Author: sseifert Date: Mon Mar 27 15:26:19 2017 New Revision: 1788955 URL: http://svn.apache.org/viewvc?rev=1788955=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml Modified: sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml?rev=1788955=1788954=1788955=diff == --- sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml Mon Mar 27 15:26:19 2017 @@ -28,7 +28,7 @@ org.apache.sling.testing.sling-mock-oak -1.0.2 +1.0.3-SNAPSHOT bundle Apache Sling Testing Sling Mock Oak-based Resource Resolver @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2 + scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x + scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x + http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x
svn commit: r1788954 - /sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2/
Author: sseifert Date: Mon Mar 27 15:26:17 2017 New Revision: 1788954 URL: http://svn.apache.org/viewvc?rev=1788954=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-oak-1.0.2 Added: sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2/ - copied from r1788953, sling/branches/testing/mocks/sling-mock-oak-1.x/
svn commit: r1788952 - /sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml
Author: sseifert Date: Mon Mar 27 15:25:22 2017 New Revision: 1788952 URL: http://svn.apache.org/viewvc?rev=1788952=rev Log: update dependency Modified: sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml Modified: sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml?rev=1788952=1788951=1788952=diff == --- sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml Mon Mar 27 15:25:22 2017 @@ -37,7 +37,7 @@ 1.2.2 2.10.1 -1.9.5-SNAPSHOT +1.9.6
svn commit: r1788953 - /sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml
Author: sseifert Date: Mon Mar 27 15:26:03 2017 New Revision: 1788953 URL: http://svn.apache.org/viewvc?rev=1788953=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-oak-1.0.2 Modified: sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml Modified: sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml?rev=1788953=1788952=1788953=diff == --- sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-oak-1.x/pom.xml Mon Mar 27 15:26:03 2017 @@ -28,7 +28,7 @@ org.apache.sling.testing.sling-mock-oak -1.0.1-SNAPSHOT +1.0.2 bundle Apache Sling Testing Sling Mock Oak-based Resource Resolver @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x - scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x - http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2
svn commit: r1788951 - /sling/branches/testing/mocks/sling-mock-1.x/pom.xml
Author: sseifert Date: Mon Mar 27 15:24:13 2017 New Revision: 1788951 URL: http://svn.apache.org/viewvc?rev=1788951=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/pom.xml?rev=1788951=1788950=1788951=diff == --- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Mon Mar 27 15:24:13 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.sling-mock -1.9.6 +1.9.7-SNAPSHOT bundle Apache Sling Testing Sling Mock Mock implementation of selected Sling APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.6 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.6 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-1.9.6 + scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x + scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x + http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x
svn commit: r1788950 - /sling/tags/org.apache.sling.testing.sling-mock-1.9.6/
Author: sseifert Date: Mon Mar 27 15:24:11 2017 New Revision: 1788950 URL: http://svn.apache.org/viewvc?rev=1788950=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-1.9.6 Added: sling/tags/org.apache.sling.testing.sling-mock-1.9.6/ - copied from r1788949, sling/branches/testing/mocks/sling-mock-1.x/
svn commit: r1788949 - /sling/branches/testing/mocks/sling-mock-1.x/pom.xml
Author: sseifert Date: Mon Mar 27 15:23:57 2017 New Revision: 1788949 URL: http://svn.apache.org/viewvc?rev=1788949=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.9.6 Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/pom.xml?rev=1788949=1788948=1788949=diff == --- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Mon Mar 27 15:23:57 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.sling-mock -1.9.5-SNAPSHOT +1.9.6 bundle Apache Sling Testing Sling Mock Mock implementation of selected Sling APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x - scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x - http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.6 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.6 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-1.9.6
svn commit: r1788948 - /sling/trunk/testing/mocks/sling-mock-oak/pom.xml
Author: sseifert Date: Mon Mar 27 15:22:51 2017 New Revision: 1788948 URL: http://svn.apache.org/viewvc?rev=1788948=rev Log: update dependency Modified: sling/trunk/testing/mocks/sling-mock-oak/pom.xml Modified: sling/trunk/testing/mocks/sling-mock-oak/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak/pom.xml?rev=1788948=1788947=1788948=diff == --- sling/trunk/testing/mocks/sling-mock-oak/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock-oak/pom.xml Mon Mar 27 15:22:51 2017 @@ -37,7 +37,7 @@ 1.4.1 2.12.1 -2.2.5-SNAPSHOT +2.2.7-SNAPSHOT
svn commit: r1788947 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Mon Mar 27 15:21:19 2017 New Revision: 1788947 URL: http://svn.apache.org/viewvc?rev=1788947=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1788947=1788946=1788947=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Mon Mar 27 15:21:19 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.sling-mock -2.2.6 +2.2.7-SNAPSHOT bundle Apache Sling Testing Sling Mock Mock implementation of selected Sling APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-2.2.6 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-2.2.6 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-2.2.6 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock + http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock
svn commit: r1788946 - /sling/tags/org.apache.sling.testing.sling-mock-2.2.6/
Author: sseifert Date: Mon Mar 27 15:21:17 2017 New Revision: 1788946 URL: http://svn.apache.org/viewvc?rev=1788946=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-2.2.6 Added: sling/tags/org.apache.sling.testing.sling-mock-2.2.6/ - copied from r1788945, sling/trunk/testing/mocks/sling-mock/
svn commit: r1788945 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Mon Mar 27 15:21:03 2017 New Revision: 1788945 URL: http://svn.apache.org/viewvc?rev=1788945=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-2.2.6 Modified: sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1788945=1788944=1788945=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Mon Mar 27 15:21:03 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.sling-mock -2.2.5-SNAPSHOT +2.2.6 bundle Apache Sling Testing Sling Mock Mock implementation of selected Sling APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock - http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-2.2.6 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-2.2.6 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-2.2.6
svn commit: r1788943 - in /sling/trunk/testing/mocks/sling-mock/src: main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java test/java/org/apache/sling/testing/mock/sling
Author: sseifert
Date: Mon Mar 27 15:04:42 2017
New Revision: 1788943
URL: http://svn.apache.org/viewvc?rev=1788943=rev
Log:
SLING-6728 sling-mock: Resource Resolver Type "NONE" does not work
Added:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
(with props)
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java?rev=1788943=1788942=1788943=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
Mon Mar 27 15:04:42 2017
@@ -122,6 +122,8 @@ class ResourceResolverFactoryInitializer
*/
private static void
initializeResourceResolverFactoryActivator(BundleContext bundleContext) {
Dictionary<String, Object> config = new Hashtable<String, Object>();
+// do not required a specific resource provider (otherwise "NONE" will
not work)
+config.put("resource.resolver.required.providers", "");
ResourceResolverFactoryActivator activator = new
ResourceResolverFactoryActivator();
MockOsgi.injectServices(activator, bundleContext);
MockOsgi.activate(activator, bundleContext, config);
Added:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java?rev=1788943=auto
==
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
(added)
+++
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
Mon Mar 27 15:04:42 2017
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.mock.sling.context;
+
+import static org.junit.Assert.assertTrue;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.SyntheticResource;
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class NoResourceResolverTypeTest {
+
+@Rule
+public SlingContext context = new SlingContext(ResourceResolverType.NONE);
+
+@Test
+public void testRoot() {
+Resource root = context.resourceResolver().getResource("/");
+assertTrue(root instanceof SyntheticResource);
+}
+
+}
Propchange:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
--
svn:eol-style = native
Propchange:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
--
--- svn:keywords (added)
+++ svn:keywords Mon Mar 27 15:04:42 2017
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
--
svn:mime-type = text/plain
svn commit: r1788942 - /sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
Author: sseifert
Date: Mon Mar 27 15:03:42 2017
New Revision: 1788942
URL: http://svn.apache.org/viewvc?rev=1788942=rev
Log:
add test to make sure "NONE" resource resolver type works
Added:
sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
(with props)
Added:
sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
URL:
http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java?rev=1788942=auto
==
---
sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
(added)
+++
sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
Mon Mar 27 15:03:42 2017
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.mock.sling.context;
+
+import static org.junit.Assert.assertNull;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class NoResourceResolverTypeTest {
+
+@Rule
+public SlingContext context = new SlingContext(ResourceResolverType.NONE);
+
+@Test
+public void testRoot() {
+Resource root = context.resourceResolver().getResource("/");
+assertNull(root);
+}
+
+}
Propchange:
sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
--
svn:eol-style = native
Propchange:
sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
--
--- svn:keywords (added)
+++ svn:keywords Mon Mar 27 15:03:42 2017
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
--
svn:mime-type = text/plain
svn commit: r1788836 - /sling/branches/testing/mocks/sling-mock-oak-1.x/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
Author: sseifert
Date: Mon Mar 27 07:33:50 2017
New Revision: 1788836
URL: http://svn.apache.org/viewvc?rev=1788836=rev
Log:
SLING-6714 sling-mock-oak 1.x: Register ExecutorService separately
Modified:
sling/branches/testing/mocks/sling-mock-oak-1.x/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
Modified:
sling/branches/testing/mocks/sling-mock-oak-1.x/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
URL:
http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java?rev=1788836=1788835=1788836=diff
==
---
sling/branches/testing/mocks/sling-mock-oak-1.x/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
(original)
+++
sling/branches/testing/mocks/sling-mock-oak-1.x/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
Mon Mar 27 07:33:50 2017
@@ -19,7 +19,10 @@
package org.apache.sling.testing.mock.sling.oak;
import java.lang.reflect.Field;
+import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
import javax.jcr.Credentials;
import javax.jcr.LoginException;
@@ -38,6 +41,7 @@ import org.apache.jackrabbit.api.Jackrab
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.sling.jcr.api.SlingRepository;
+import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,41 +53,58 @@ public final class OakMockSlingRepositor
private static final String ADMIN_NAME = "admin";
private static final String ADMIN_PASSWORD = "admin";
-private Oak oak;
private Repository repository;
+private ExecutorService executor;
+private ScheduledExecutorService scheduledExecutor;
private static final Logger log =
LoggerFactory.getLogger(OakMockSlingRepository.class);
@Activate
protected void activate(ComponentContext componentContext) {
-this.oak = new Oak();
-Jcr jcr = new Jcr(oak).with(new ExtraSlingContent());
+executor = Executors.newSingleThreadExecutor();
+scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+
+BundleContext bundleContext = componentContext.getBundleContext();
+if (bundleContext.getServiceReference(Executor.class.getName()) ==
null) {
+bundleContext.registerService(Executor.class.getName(), executor,
null);
+}
+
+Oak oak = new Oak()
+.with(executor)
+.with(scheduledExecutor);
+
+Jcr jcr = new Jcr(oak)
+.with(new ExtraSlingContent())
+.with(executor)
+.with(scheduledExecutor);
+
this.repository = jcr.createRepository();
}
@Deactivate
protected void deactivate(ComponentContext componentContext) {
+// shutdown executors
+// force immediate shutdown for all executors without waiting for
tasks for completion - we're only in unit tests!
+executor.shutdownNow();
+scheduledExecutor.shutdownNow();
+shutdownExecutorService(repository, "scheduledExecutor");
+
// shutdown OAK JCR repository
((JackrabbitRepository)repository).shutdown();
-
-// shutdown further OAK executor services via reflection
-shutdownExecutorService("executor");
-shutdownExecutorService("scheduledExecutor");
}
-private void shutdownExecutorService(String fieldName) {
+private void shutdownExecutorService(Object instance, String fieldName) {
try {
-Field executorField = Oak.class.getDeclaredField(fieldName);
+Field executorField =
instance.getClass().getDeclaredField(fieldName);
executorField.setAccessible(true);
-ExecutorService executor =
(ExecutorService)executorField.get(this.oak);
+ExecutorService executor =
(ExecutorService)executorField.get(instance);
executor.shutdownNow();
}
catch (Throwable ex) {
-log.error("Potential Memory leak: Unable to shutdown executor
service from field '" + fieldName + "' in " + this.oak, ex);
+log.error("Potential Memory leak: Unable to shutdown executor
service from field '" + fieldName + "' in " + instance, ex);
}
}
-
public String getDescriptor(String key) {
return repository.getDescriptor(key);
}
svn commit: r1788650 - in /sling/trunk/bundles/extensions/caconfig/impl: ./ .gitignore pom.xml
Author: sseifert Date: Sat Mar 25 08:34:45 2017 New Revision: 1788650 URL: http://svn.apache.org/viewvc?rev=1788650=rev Log: SLING-6711 Context-Aware Config: Shade commons.osgi dependency Added: sling/trunk/bundles/extensions/caconfig/impl/.gitignore Modified: sling/trunk/bundles/extensions/caconfig/impl/ (props changed) sling/trunk/bundles/extensions/caconfig/impl/pom.xml Propchange: sling/trunk/bundles/extensions/caconfig/impl/ -- --- svn:ignore (original) +++ svn:ignore Sat Mar 25 08:34:45 2017 @@ -1,14 +1,15 @@ -target -sling -bin -logs -jackrabbit-repository -derby.log *.iml *.ipr *.iws -.settings -.project .classpath .externalToolBuilders +.project +.settings +bin +dependency-reduced-pom.xml +derby.log +jackrabbit-repository +logs maven-eclipse.xml +sling +target Added: sling/trunk/bundles/extensions/caconfig/impl/.gitignore URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/.gitignore?rev=1788650=auto == --- sling/trunk/bundles/extensions/caconfig/impl/.gitignore (added) +++ sling/trunk/bundles/extensions/caconfig/impl/.gitignore Sat Mar 25 08:34:45 2017 @@ -0,0 +1 @@ +dependency-reduced-pom.xml \ No newline at end of file Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/pom.xml?rev=1788650=1788649=1788650=diff == --- sling/trunk/bundles/extensions/caconfig/impl/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/impl/pom.xml Sat Mar 25 08:34:45 2017 @@ -47,15 +47,64 @@ true - - org.apache.sling.commons.osgi + + + !org.apache.sling.commons.osgi, + * + + +org.apache.maven.plugins +maven-shade-plugin +3.0.0 + + +package + +shade + + +true +true + + + org.apache.sling:org.apache.sling.commons.osgi + + + + + org.apache.sling.commons.osgi + caconfigimpl.org.apache.sling.commons.osgi + + + + + org.apache.sling:org.apache.sling.commons.osgi + + org/apache/sling/commons/osgi/** + + + + + + + + +org.apache.rat +apache-rat-plugin + + +dependency-reduced-pom.xml + + + + org.apache.sling org.apache.sling.commons.osgi
svn commit: r1009001 - in /websites/production/sling/content: ./ components/
Author: sseifert Date: Sat Mar 25 07:31:53 2017 New Revision: 1009001 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1009000, websites/staging/sling/trunk/content/ websites/production/sling/content/components/ - copied from r1009000, websites/production/sling/content/components/
svn commit: r1788644 - /sling/trunk/parent/pom.xml
Author: sseifert Date: Sat Mar 25 07:30:54 2017 New Revision: 1788644 URL: http://svn.apache.org/viewvc?rev=1788644=rev Log: use maven-sling-plugin 2.2.0 Modified: sling/trunk/parent/pom.xml Modified: sling/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1788644=1788643=1788644=diff == --- sling/trunk/parent/pom.xml (original) +++ sling/trunk/parent/pom.xml Sat Mar 25 07:30:54 2017 @@ -326,7 +326,7 @@ org.apache.sling maven-sling-plugin -2.1.8 +2.2.0 org.apache.sling
svn commit: r1788488 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: sseifert Date: Fri Mar 24 15:50:14 2017 New Revision: 1788488 URL: http://svn.apache.org/viewvc?rev=1788488=rev Log: Apache Sling Maven Sling Plugin 2.2.0 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1788488=1788487=1788488=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Mar 24 15:50:14 2017 @@ -218,6 +218,6 @@ XSS Protection|org.apache.sling.xss|1.0. # Format: title|artifactId|version[|classifier[|extension]] Maven JSPC Plugin|maven-jspc-plugin|2.0.8 Maven Launchpad Plugin|maven-launchpad-plugin|2.3.4 -Maven Sling Plugin|maven-sling-plugin|2.1.10 +Maven Sling Plugin|maven-sling-plugin|2.2.0 Slingstart Maven Plugin|slingstart-maven-plugin|1.7.2 HTL Maven Plugin|htl-maven-plugin|1.0.6 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1788488=1788487=1788488=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Mar 24 15:50:14 2017 @@ -1,6 +1,6 @@ Title: News -* New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.0 (March 24th, 2017) +* New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.0, Apache Sling Maven Sling Plugin 2.2.0 (March 24th, 2017) * New Releases: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 2.2.4, Testing OSGi Mock 1.9.4 (March 23th, 2017) * New Releases: Apache Sling Commons JSON 2.0.20, Apache Sling Karaf repoinit 0.2.0, Apache Sling Scripting JSP API Wrapper 1.0.0, Apache Sling Scripting JSP EL Wrapper 1.0.0, Apache Sling Scripting JSP 2.3.0, Apache Sling Testing PaxExam 0.0.4, Apache Sling JCR Oak Server 1.1.4, Apache Sling Scripting Thymeleaf 1.1.0, Apache Sling Resource Presence 0.0.2 (March 20th, 2017) * New Releases: Apache Sling Resource Resolver 1.5.20, Apache Sling JCR Repoinit 1.1.4 (March 13th, 2017)
svn commit: r1008918 - in /websites/production/sling/content/components: maven-sling-plugin-archives/maven-sling-plugin-2.2.0/ maven-sling-plugin/
Author: sseifert Date: Fri Mar 24 15:49:30 2017 New Revision: 1008918 Log: Apache Sling Maven Sling Plugin 2.2.0 Added: websites/production/sling/content/components/maven-sling-plugin/ - copied from r1008917, websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-2.2.0/ Removed: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-2.2.0/
svn commit: r18895 - /release/sling/
Author: sseifert Date: Fri Mar 24 15:47:59 2017 New Revision: 18895 Log: Apache Sling Maven Sling Plugin 2.2.0 Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar (with props) release/sling/maven-sling-plugin-2.2.0-javadoc.jar.asc release/sling/maven-sling-plugin-2.2.0-javadoc.jar.md5 release/sling/maven-sling-plugin-2.2.0-javadoc.jar.sha1 release/sling/maven-sling-plugin-2.2.0-source-release.zip (with props) release/sling/maven-sling-plugin-2.2.0-source-release.zip.asc release/sling/maven-sling-plugin-2.2.0-source-release.zip.md5 release/sling/maven-sling-plugin-2.2.0-source-release.zip.sha1 release/sling/maven-sling-plugin-2.2.0-sources.jar (with props) release/sling/maven-sling-plugin-2.2.0-sources.jar.asc release/sling/maven-sling-plugin-2.2.0-sources.jar.md5 release/sling/maven-sling-plugin-2.2.0-sources.jar.sha1 release/sling/maven-sling-plugin-2.2.0.jar (with props) release/sling/maven-sling-plugin-2.2.0.jar.asc release/sling/maven-sling-plugin-2.2.0.jar.md5 release/sling/maven-sling-plugin-2.2.0.jar.sha1 release/sling/maven-sling-plugin-2.2.0.pom release/sling/maven-sling-plugin-2.2.0.pom.asc release/sling/maven-sling-plugin-2.2.0.pom.md5 release/sling/maven-sling-plugin-2.2.0.pom.sha1 Removed: release/sling/maven-sling-plugin-2.1.10-javadoc.jar release/sling/maven-sling-plugin-2.1.10-javadoc.jar.asc release/sling/maven-sling-plugin-2.1.10-javadoc.jar.md5 release/sling/maven-sling-plugin-2.1.10-javadoc.jar.sha1 release/sling/maven-sling-plugin-2.1.10-source-release.zip release/sling/maven-sling-plugin-2.1.10-source-release.zip.asc release/sling/maven-sling-plugin-2.1.10-source-release.zip.md5 release/sling/maven-sling-plugin-2.1.10-source-release.zip.sha1 release/sling/maven-sling-plugin-2.1.10-sources.jar release/sling/maven-sling-plugin-2.1.10-sources.jar.asc release/sling/maven-sling-plugin-2.1.10-sources.jar.md5 release/sling/maven-sling-plugin-2.1.10-sources.jar.sha1 release/sling/maven-sling-plugin-2.1.10.jar release/sling/maven-sling-plugin-2.1.10.jar.asc release/sling/maven-sling-plugin-2.1.10.jar.md5 release/sling/maven-sling-plugin-2.1.10.jar.sha1 release/sling/maven-sling-plugin-2.1.10.pom release/sling/maven-sling-plugin-2.1.10.pom.asc release/sling/maven-sling-plugin-2.1.10.pom.md5 release/sling/maven-sling-plugin-2.1.10.pom.sha1 Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/maven-sling-plugin-2.2.0-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar.asc == --- release/sling/maven-sling-plugin-2.2.0-javadoc.jar.asc (added) +++ release/sling/maven-sling-plugin-2.2.0-javadoc.jar.asc Fri Mar 24 15:47:59 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJY0QIMAAoJEM4rf/Z1146SI+AIAIdyGWk6nxqwEhytf3I7v7EV +PihHyjuQsCN2SsrjXeYwph84+KMpHd8Sunwi2q2lmAe0T4m03WCup/jLyQusHWR9 +NGWZT+UYH+MaZ/RcH/5Q+ThdjWGomFpzvIw0skZDh1ff/j0QEQnUEPyReaQUDZCF +qbbN9u7bPiOneEealTK6CWArSbP2D1XY90MCp3iC4iZzbyk+DN2quvCUvZdAyWBs +3g/dhYO38jIdy5NxQZCpJisQgjslPzMsaYIRhQk+46eBWsflouit/UuY+LfIONQ4 +YiDPzfNAmASDcJDOkKW9dE5Vp048FumFTTXG9GFDdvYH5dW9rVbyS6WDDHq0X1o= +=qQxF +-END PGP SIGNATURE- Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar.md5 == --- release/sling/maven-sling-plugin-2.2.0-javadoc.jar.md5 (added) +++ release/sling/maven-sling-plugin-2.2.0-javadoc.jar.md5 Fri Mar 24 15:47:59 2017 @@ -0,0 +1 @@ +a85d579448f373ce0aafc3f4ab08a8ef \ No newline at end of file Added: release/sling/maven-sling-plugin-2.2.0-javadoc.jar.sha1 == --- release/sling/maven-sling-plugin-2.2.0-javadoc.jar.sha1 (added) +++ release/sling/maven-sling-plugin-2.2.0-javadoc.jar.sha1 Fri Mar 24 15:47:59 2017 @@ -0,0 +1 @@ +4eef373b677f635f0741ac3c2d14464cc04eea49 \ No newline at end of file Added: release/sling/maven-sling-plugin-2.2.0-source-release.zip == Binary file - no diff available. Propchange: release/sling/maven-sling-plugin-2.2.0-source-release.zip -- svn:mime-type = application/octet-stream Propchange: release/sling/maven-sling-plugin-2.2.0-source-release.zip -- svn:needs-lock = * Added: release/sling/maven-sling-plugin-2.2.0-source-release.zip.asc
svn commit: r1788371 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: sseifert Date: Fri Mar 24 07:54:15 2017 New Revision: 1788371 URL: http://svn.apache.org/viewvc?rev=1788371=rev Log: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.0 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1788371=1788370=1788371=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Mar 24 07:54:15 2017 @@ -51,9 +51,9 @@ Commons Threads|org.apache.sling.commons Content Detection Support|org.apache.sling.commons.contentdetection|1.0.2 Context-Aware Configuration API|org.apache.sling.caconfig.api|1.1.0 Context-Aware Configuration bnd Plugin|org.apache.sling.caconfig.bnd-plugin|1.0.2 -Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.2.0 -Context-Aware Configuration Mock Plugin|org.apache.sling.testing.caconfig-mock-plugin|1.0.0 -Context-Aware Configuration SPI|org.apache.sling.caconfig.spi|1.2.0 +Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.3.0 +Context-Aware Configuration Mock Plugin|org.apache.sling.testing.caconfig-mock-plugin|1.1.0 +Context-Aware Configuration SPI|org.apache.sling.caconfig.spi|1.3.0 Crankstart API|org.apache.sling.crankstart.api|1.0.0 Crankstart API Fragment|org.apache.sling.crankstart.api.fragment|1.0.2 Crankstart Core|org.apache.sling.crankstart.core|1.0.0 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1788371=1788370=1788371=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Mar 24 07:54:15 2017 @@ -1,5 +1,6 @@ Title: News +* New Releases: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.0 (March 24th, 2017) * New Releases: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 2.2.4, Testing OSGi Mock 1.9.4 (March 23th, 2017) * New Releases: Apache Sling Commons JSON 2.0.20, Apache Sling Karaf repoinit 0.2.0, Apache Sling Scripting JSP API Wrapper 1.0.0, Apache Sling Scripting JSP EL Wrapper 1.0.0, Apache Sling Scripting JSP 2.3.0, Apache Sling Testing PaxExam 0.0.4, Apache Sling JCR Oak Server 1.1.4, Apache Sling Scripting Thymeleaf 1.1.0, Apache Sling Resource Presence 0.0.2 (March 20th, 2017) * New Releases: Apache Sling Resource Resolver 1.5.20, Apache Sling JCR Repoinit 1.1.4 (March 13th, 2017)
svn commit: r18890 - /release/sling/
Author: sseifert Date: Fri Mar 24 07:52:02 2017 New Revision: 18890 Log: Apache Sling CAConfig SPI 1.3.0, CAConfig Impl 1.3.0, CAConfig Mock Plugin 1.1.0 Added: release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0-javadoc.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip (with props) release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.asc release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0-source-release.zip.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0-sources.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.0.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.asc release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.3.0.pom release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.asc release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.md5 release/sling/org.apache.sling.caconfig.impl-1.3.0.pom.sha1 release/sling/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar (with props) release/sling/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar.asc release/sling/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar.md5 release/sling/org.apache.sling.caconfig.spi-1.3.0-javadoc.jar.sha1 release/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip (with props) release/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.asc release/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.md5 release/sling/org.apache.sling.caconfig.spi-1.3.0-source-release.zip.sha1 release/sling/org.apache.sling.caconfig.spi-1.3.0-sources.jar (with props) release/sling/org.apache.sling.caconfig.spi-1.3.0-sources.jar.asc release/sling/org.apache.sling.caconfig.spi-1.3.0-sources.jar.md5 release/sling/org.apache.sling.caconfig.spi-1.3.0-sources.jar.sha1 release/sling/org.apache.sling.caconfig.spi-1.3.0.jar (with props) release/sling/org.apache.sling.caconfig.spi-1.3.0.jar.asc release/sling/org.apache.sling.caconfig.spi-1.3.0.jar.md5 release/sling/org.apache.sling.caconfig.spi-1.3.0.jar.sha1 release/sling/org.apache.sling.caconfig.spi-1.3.0.pom release/sling/org.apache.sling.caconfig.spi-1.3.0.pom.asc release/sling/org.apache.sling.caconfig.spi-1.3.0.pom.md5 release/sling/org.apache.sling.caconfig.spi-1.3.0.pom.sha1 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar (with props) release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar.asc release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar.md5 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-javadoc.jar.sha1 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip (with props) release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.asc release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.md5 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-source-release.zip.sha1 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar (with props) release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar.asc release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar.md5 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0-sources.jar.sha1 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar (with props) release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.asc release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.md5 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.jar.sha1 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom.asc release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom.md5 release/sling/org.apache.sling.testing.caconfig-mock-plugin-1.1.0.pom.sha1 Removed: release/sling/org.apache.sling.caconfig.impl-1.2.0-javadoc.jar release/sling/org.apache.sling.caconfig.impl-1.2.0-javadoc.jar.asc release/sling/org.apache.sling.caconfig.impl-1.2.0-javadoc.jar.md5 release/sling
svn commit: r1008874 - in /websites/production/sling/content: ./ components/
Author: sseifert Date: Thu Mar 23 20:24:02 2017 New Revision: 1008874 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1008873, websites/staging/sling/trunk/content/ websites/production/sling/content/components/ - copied from r1008873, websites/production/sling/content/components/
svn commit: r1788266 - in /sling/trunk: bundles/extensions/caconfig/impl/pom.xml bundles/extensions/caconfig/spi/pom.xml bundles/extensions/fsresource/pom.xml testing/mocks/caconfig-mock-plugin/pom.xm
Author: sseifert Date: Thu Mar 23 15:13:09 2017 New Revision: 1788266 URL: http://svn.apache.org/viewvc?rev=1788266=rev Log: update dependencies Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml sling/trunk/bundles/extensions/caconfig/spi/pom.xml sling/trunk/bundles/extensions/fsresource/pom.xml sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/bundles/extensions/caconfig/impl/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/pom.xml?rev=1788266=1788265=1788266=diff == --- sling/trunk/bundles/extensions/caconfig/impl/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/impl/pom.xml Thu Mar 23 15:13:09 2017 @@ -144,7 +144,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.2.0 +2.2.4 test Modified: sling/trunk/bundles/extensions/caconfig/spi/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/spi/pom.xml?rev=1788266=1788265=1788266=diff == --- sling/trunk/bundles/extensions/caconfig/spi/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/spi/pom.xml Thu Mar 23 15:13:09 2017 @@ -81,7 +81,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.2.0 +2.2.4 test Modified: sling/trunk/bundles/extensions/fsresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1788266=1788265=1788266=diff == --- sling/trunk/bundles/extensions/fsresource/pom.xml (original) +++ sling/trunk/bundles/extensions/fsresource/pom.xml Thu Mar 23 15:13:09 2017 @@ -146,7 +146,7 @@ org.apache.sling org.apache.sling.jcr.contentparser -1.0.0-SNAPSHOT +1.0.0 compile Modified: sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml?rev=1788266=1788265=1788266=diff == --- sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml (original) +++ sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml Thu Mar 23 15:13:09 2017 @@ -80,7 +80,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.2.0 +2.2.4 provided Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1788266=1788265=1788266=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu Mar 23 15:13:09 2017 @@ -45,7 +45,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.2.3-SNAPSHOT +2.2.4 compile @@ -132,7 +132,7 @@ org.apache.sling org.apache.sling.jcr.contentparser -1.0.0-SNAPSHOT +1.0.0 compile
svn commit: r1788264 - /sling/branches/testing/mocks/sling-mock-1.x/pom.xml
Author: sseifert Date: Thu Mar 23 15:13:02 2017 New Revision: 1788264 URL: http://svn.apache.org/viewvc?rev=1788264=rev Log: update dependencies Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/pom.xml?rev=1788264=1788263=1788264=diff == --- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Thu Mar 23 15:13:02 2017 @@ -45,7 +45,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -1.9.3-SNAPSHOT +1.9.4 compile @@ -125,7 +125,7 @@ org.apache.sling org.apache.sling.jcr.contentparser -1.0.0-SNAPSHOT +1.0.0 compile
svn commit: r1788265 - /sling/branches/fsresource-1.x/pom.xml
Author: sseifert Date: Thu Mar 23 15:13:04 2017 New Revision: 1788265 URL: http://svn.apache.org/viewvc?rev=1788265=rev Log: update dependencies Modified: sling/branches/fsresource-1.x/pom.xml Modified: sling/branches/fsresource-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1788265=1788264=1788265=diff == --- sling/branches/fsresource-1.x/pom.xml (original) +++ sling/branches/fsresource-1.x/pom.xml Thu Mar 23 15:13:04 2017 @@ -148,7 +148,7 @@ org.apache.sling org.apache.sling.jcr.contentparser -1.0.0-SNAPSHOT +1.0.0 compile @@ -165,7 +165,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.2.2 +2.2.4 test
svn commit: r1788237 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: sseifert Date: Thu Mar 23 13:09:07 2017 New Revision: 1788237 URL: http://svn.apache.org/viewvc?rev=1788237=rev Log: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 2.2.4, Testing OSGi Mock 1.9.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=1788237=1788236=1788237=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Thu Mar 23 13:09:07 2017 @@ -103,7 +103,8 @@ JCR API Wrapper|org.apache.sling.jcr.jcr JCR Base|org.apache.sling.jcr.base|3.0.0 JCR ClassLoader|org.apache.sling.jcr.classloader|3.2.2 JCR Compiler|org.apache.sling.jcr.compiler|2.1.0 -JCR ContentLoader|org.apache.sling.jcr.contentloader|2.1.10 +JCR Content Loader|org.apache.sling.jcr.contentloader|2.1.10 +JCR Content Parser|org.apache.sling.jcr.contentparser|1.0.0 JCR DavEx|org.apache.sling.jcr.davex|1.3.8 JCR Jackrabbit AccessManager|org.apache.sling.jcr.jackrabbit.accessmanager|2.1.2 JCR Jackrabbit Server|org.apache.sling.jcr.jackrabbit.server|2.3.0 @@ -195,7 +196,7 @@ Tenant|org.apache.sling.tenant|1.1.0 Testing Hamcrest|org.apache.sling.testing.hamcrest|1.0.2 Testing JCR Mock|org.apache.sling.testing.jcr-mock|1.2.0 Testing Logging Mock|org.apache.sling.testing.logging-mock|2.0.0 -Testing OSGi Mock|org.apache.sling.testing.osgi-mock|2.2.2 +Testing OSGi Mock|org.apache.sling.testing.osgi-mock|2.2.4 Testing PaxExam|org.apache.sling.testing.paxexam|0.0.4 Testing Resource Resolver Mock|org.apache.sling.testing.resourceresolver-mock|1.1.16 Testing Sling Mock|org.apache.sling.testing.sling-mock|2.2.4 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1788237=1788236=1788237=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Thu Mar 23 13:09:07 2017 @@ -1,5 +1,6 @@ Title: News +* New Releases: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 2.2.4, Testing OSGi Mock 1.9.4 (March 23th, 2017) * New Releases: Apache Sling Commons JSON 2.0.20, Apache Sling Karaf repoinit 0.2.0, Apache Sling Scripting JSP API Wrapper 1.0.0, Apache Sling Scripting JSP EL Wrapper 1.0.0, Apache Sling Scripting JSP 2.3.0, Apache Sling Testing PaxExam 0.0.4, Apache Sling JCR Oak Server 1.1.4, Apache Sling Scripting Thymeleaf 1.1.0, Apache Sling Resource Presence 0.0.2 (March 20th, 2017) * New Releases: Apache Sling Resource Resolver 1.5.20, Apache Sling JCR Repoinit 1.1.4 (March 13th, 2017) * New Releases: Apache Sling i18n 2.5.8, Apache Sling JCR Installer 3.1.24, Apache Sling XSS 1.0.18, Apache Sling HTL JavaScript Use Provider 1.0.20, Apache Sling Scripting Core 2.0.46, Apache Sling Health Check Core 1.2.6, Apache Sling Event 4.2.2, Apache Sling Distributed Event Admin 1.1.2 (March 8th, 2017)
svn commit: r18879 - /release/sling/
Author: sseifert Date: Thu Mar 23 13:05:32 2017 New Revision: 18879 Log: Apache Sling JCR Content Parser 1.0.0, Testing OSGi Mock 2.2.4, OSGi Mock 1.9.4 Added: release/sling/org.apache.sling.jcr.contentparser-1.0.0-javadoc.jar (with props) release/sling/org.apache.sling.jcr.contentparser-1.0.0-javadoc.jar.asc release/sling/org.apache.sling.jcr.contentparser-1.0.0-javadoc.jar.md5 release/sling/org.apache.sling.jcr.contentparser-1.0.0-javadoc.jar.sha1 release/sling/org.apache.sling.jcr.contentparser-1.0.0-source-release.zip (with props) release/sling/org.apache.sling.jcr.contentparser-1.0.0-source-release.zip.asc release/sling/org.apache.sling.jcr.contentparser-1.0.0-source-release.zip.md5 release/sling/org.apache.sling.jcr.contentparser-1.0.0-source-release.zip.sha1 release/sling/org.apache.sling.jcr.contentparser-1.0.0-sources.jar (with props) release/sling/org.apache.sling.jcr.contentparser-1.0.0-sources.jar.asc release/sling/org.apache.sling.jcr.contentparser-1.0.0-sources.jar.md5 release/sling/org.apache.sling.jcr.contentparser-1.0.0-sources.jar.sha1 release/sling/org.apache.sling.jcr.contentparser-1.0.0.jar (with props) release/sling/org.apache.sling.jcr.contentparser-1.0.0.jar.asc release/sling/org.apache.sling.jcr.contentparser-1.0.0.jar.md5 release/sling/org.apache.sling.jcr.contentparser-1.0.0.jar.sha1 release/sling/org.apache.sling.jcr.contentparser-1.0.0.pom release/sling/org.apache.sling.jcr.contentparser-1.0.0.pom.asc release/sling/org.apache.sling.jcr.contentparser-1.0.0.pom.md5 release/sling/org.apache.sling.jcr.contentparser-1.0.0.pom.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.4-javadoc.jar (with props) release/sling/org.apache.sling.testing.osgi-mock-2.2.4-javadoc.jar.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.4-javadoc.jar.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.4-javadoc.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.4-source-release.zip (with props) release/sling/org.apache.sling.testing.osgi-mock-2.2.4-source-release.zip.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.4-source-release.zip.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.4-source-release.zip.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.4-sources.jar (with props) release/sling/org.apache.sling.testing.osgi-mock-2.2.4-sources.jar.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.4-sources.jar.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.4-sources.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.4.jar (with props) release/sling/org.apache.sling.testing.osgi-mock-2.2.4.jar.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.4.jar.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.4.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.4.pom release/sling/org.apache.sling.testing.osgi-mock-2.2.4.pom.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.4.pom.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.4.pom.sha1 Removed: release/sling/org.apache.sling.testing.osgi-mock-2.2.2-javadoc.jar release/sling/org.apache.sling.testing.osgi-mock-2.2.2-javadoc.jar.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.2-javadoc.jar.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.2-javadoc.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.2-source-release.zip release/sling/org.apache.sling.testing.osgi-mock-2.2.2-source-release.zip.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.2-source-release.zip.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.2-source-release.zip.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.2-sources.jar release/sling/org.apache.sling.testing.osgi-mock-2.2.2-sources.jar.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.2-sources.jar.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.2-sources.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.2.jar release/sling/org.apache.sling.testing.osgi-mock-2.2.2.jar.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.2.jar.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.2.jar.sha1 release/sling/org.apache.sling.testing.osgi-mock-2.2.2.pom release/sling/org.apache.sling.testing.osgi-mock-2.2.2.pom.asc release/sling/org.apache.sling.testing.osgi-mock-2.2.2.pom.md5 release/sling/org.apache.sling.testing.osgi-mock-2.2.2.pom.sha1 Added: release/sling/org.apache.sling.jcr.contentparser-1.0.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.jcr.contentparser-1.0.0-javadoc.jar
svn commit: r1008823 - in /websites/production/sling/content: ./ components/
Author: sseifert Date: Wed Mar 22 21:36:24 2017 New Revision: 1008823 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1008822, websites/staging/sling/trunk/content/ websites/production/sling/content/components/ - copied from r1008822, websites/production/sling/content/components/
svn commit: r1788163 - /sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.mdtext
Author: sseifert
Date: Wed Mar 22 21:35:08 2017
New Revision: 1788163
URL: http://svn.apache.org/viewvc?rev=1788163=rev
Log:
use only property JSON syntax for override strings
Modified:
sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.mdtext
Modified:
sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.mdtext?rev=1788163=1788162=1788163=diff
==
---
sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.mdtext
(original)
+++
sling/site/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-override.mdtext
Wed Mar 22 21:35:08 2017
@@ -34,12 +34,12 @@ When the syntax `{configName}/{propertyN
Override string examples with real values:
my-config/property1="value 1"
-my-config/sub1/property1='value 1'
-my-config/property1=['value 1','value 2']
+my-config/sub1/property1="value 1"
+my-config/property1=["value 1","value 2"]
my-config/property1=123
-x.y.z.MyConfig={prop1='value1', prop2=[1,2,3], prop3=true, prop4=1.23}
-[/content/region1]my-config/property1='value 1'
-[/content/region1]my-config/sub1={prop1="value 1"}
+x.y.z.MyConfig={"prop1"="value1","prop2"=[1,2,3],"prop3"=true,"prop4"=1.23}
+[/content/region1]my-config/property1="value 1"
+[/content/region1]my-config/sub1={"prop1":"value 1"}
If multiple statements are defined affecting the same content path,
configuration name and property name, they overwrite each other. That means the
override string defined last wins.
@@ -55,8 +55,8 @@ The parameters are defined when starting
Example:
-Dsling.caconfig.override.my-config/sub1/property1=123
--D"sling.caconfig.override.my-config/property1=['value 1','value 2']"
-
-D"sling.caconfig.override.[/content/region1]x.y.z.MyConfig={prop1='value1',
prop2=[1,2,3], prop3=true, prop4=1.23}"
+-D"sling.caconfig.override.my-config/property1=[\"value 1\",\"value 2\"]"
+
-D"sling.caconfig.override.[/content/region1]x.y.z.MyConfig={\"prop1\"=\"value1\",\"prop2\"=[1,2,3],\"prop3\"=true,\"prop4\"=1.23}"
This provider is not active by default, it has to be activated via OSGi
configuration ("Apache Sling Context-Aware System Property Configuration
Override Provider").
svn commit: r1788160 - in /sling/trunk/bundles/extensions/caconfig/impl/src: main/java/org/apache/sling/caconfig/impl/ test/java/org/apache/sling/caconfig/management/impl/
Author: sseifert
Date: Wed Mar 22 20:38:10 2017
New Revision: 1788160
URL: http://svn.apache.org/viewvc?rev=1788160=rev
Log:
SLING-6695 Persistence Strategy Adapter: Do not modify collection parent name
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java?rev=1788160=1788159=1788160=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationPersistenceStrategyBridge.java
Wed Mar 22 20:38:10 2017
@@ -143,7 +143,8 @@ public final class ConfigurationPersiste
@Override
public Resource getCollectionParentResource(Resource resource) {
-return delegate.getResource(resource);
+// with SPI/Impl 1.2 it was not possible to manipulate collection
parent resource
+return resource;
}
@Override
@@ -158,7 +159,8 @@ public final class ConfigurationPersiste
@Override
public String getCollectionParentResourcePath(String resourcePath) {
-return delegate.getResourcePath(resourcePath);
+// with SPI/Impl 1.2 it was not possible to manipulate collection
parent resource
+return resourcePath;
}
@Override
@@ -173,7 +175,8 @@ public final class ConfigurationPersiste
@Override
public String getCollectionParentConfigName(String configName, String
relatedConfigPath) {
-return delegate.getResourcePath(configName);
+// with SPI/Impl 1.2 it was not possible to manipulate collection
parent resource
+return configName;
}
@Override
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java?rev=1788160=1788159=1788160=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerImplTest.java
Wed Mar 22 20:38:10 2017
@@ -170,16 +170,16 @@ public class ConfigurationPersistenceStr
}, Constants.SERVICE_RANKING, 1000);
assertSame(resource2, underTest.getResource(resource1));
-assertSame(resource2,
underTest.getCollectionParentResource(resource1));
+assertSame(resource1,
underTest.getCollectionParentResource(resource1));
assertSame(resource2, underTest.getCollectionItemResource(resource1));
assertEquals(resource2.getPath(),
underTest.getResourcePath(resource1.getPath()));
-assertEquals(resource2.getPath(),
underTest.getCollectionParentResourcePath(resource1.getPath()));
+assertEquals(resource1.getPath(),
underTest.getCollectionParentResourcePath(resource1.getPath()));
assertEquals(resource2.getPath(),
underTest.getCollectionItemResourcePath(resource1.getPath()));
assertEquals(resource2.getPath(),
underTest.getConfigName(resource1.getPath(), null));
-assertEquals(resource2.getPath(),
underTest.getCollectionParentConfigName(resource1.getPath(), null));
+assertEquals(resource1.getPath(),
underTest.getCollectionParentConfigName(resource1.getPath(), null));
assertEquals(resource2.getPath(),
underTest.getCollectionItemConfigName(resource1.getPath(), null));
assertEquals(ImmutableList.of(resource2.getPath(),
resource1.getPath()),
ImmutableList.copyOf(underTest.getAllConfigNames(resource1.getPath(;
-assertEquals(ImmutableList.of(resource2.getPath(),
resource1.getPath()),
ImmutableList.copyOf(underTest.getAllCollectionParentConfigNames(resource1.getPath(;
+assertEquals(ImmutableList.of(resource1.getPath()),
ImmutableList.copyOf(underTest.getAllCollectionParentConfigNames(resource1
svn commit: r1788159 - in /sling/trunk/bundles/extensions/caconfig/impl/src: main/java/org/apache/sling/caconfig/management/impl/ test/java/org/apache/sling/caconfig/management/impl/
Author: sseifert
Date: Wed Mar 22 20:37:03 2017
New Revision: 1788159
URL: http://svn.apache.org/viewvc?rev=1788159=rev
Log:
SLING-6696 Persistence Strategy: Ensure configName is never null
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy2.java
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java?rev=1788159=1788158=1788159=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
Wed Mar 22 20:37:03 2017
@@ -30,6 +30,7 @@ import java.util.TreeSet;
import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
@@ -178,8 +179,9 @@ final class ConfigurationDataImpl implem
String relatedConfigPath = resolvedConfigurationResource !=
null ? resolvedConfigurationResource.getPath() : null;
String nestedConfigName;
if (configResourceCollection) {
+String collectionItemName =
StringUtils.defaultString(getCollectionItemName(), "newItem");
nestedConfigName =
configurationPersistenceStrategy.getCollectionParentConfigName(configName,
relatedConfigPath)
-+ "/" +
configurationPersistenceStrategy.getCollectionItemConfigName(getCollectionItemName(),
relatedConfigPath)
++ "/" +
configurationPersistenceStrategy.getCollectionItemConfigName(collectionItemName,
relatedConfigPath)
+ "/" + nestedConfigMetadata.getName();
}
else {
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java?rev=1788159=1788158=1788159=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java
Wed Mar 22 20:37:03 2017
@@ -18,6 +18,8 @@
*/
package org.apache.sling.caconfig.management.impl;
+import static org.junit.Assert.assertNotNull;
+
import java.util.HashSet;
import java.util.Map;
@@ -45,46 +47,55 @@ public class CustomConfigurationPersiste
@Override
public Resource getResource(Resource resource) {
+assertNotNull(resource);
return resource.getChild(CHILD_NODE_NAME);
}
@Override
public Resource getCollectionParentResource(Resource resource) {
+assertNotNull(resource);
return resource;
}
@Override
public Resource getCollectionItemResource(Resource resource) {
+assertNotNull(resource);
return resource.getChild(CHILD_NODE_NAME);
}
@Override
public String getResourcePath(String resourcePath) {
+assertNotNull(resourcePath);
return resourcePath + "/" + CHILD_NODE_NAME;
}
@Override
public String getCollectionParentResourcePath(String resourcePath) {
+assertNotNull(resourcePath);
return resourcePath;
}
@Override
public String getCollectionItemResourcePath(String resourcePath) {
+assertNotNull(resourcePath);
return resourcePath + "/" + CHILD_NODE_NAME;
}
@Override
public String getConfigName(String configName, String relatedConfigPath) {
+assertNotNull(configName);
return configName + "/" + CHILD_NODE_NAME;
}
@Override
public String getC
svn commit: r1788072 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Author: sseifert Date: Wed Mar 22 09:07:28 2017 New Revision: 1788072 URL: http://svn.apache.org/viewvc?rev=1788072=rev Log: update to org.apache.sling.commons.json 2.0.20 Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1788072=1788071=1788072=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Wed Mar 22 09:07:28 2017 @@ -80,7 +80,7 @@ org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.2 org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.4 org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.6 -org.apache.sling/org.apache.sling.commons.json/2.0.18 +org.apache.sling/org.apache.sling.commons.json/2.0.20 org.apache.felix/org.apache.felix.bundlerepository/1.6.4 org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2 org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.5
svn commit: r1008745 - in /websites/production/sling/content/components/maven-sling-plugin-archives: maven-sling-plugin-2.2.0/ maven-sling-plugin-LATEST/
Author: sseifert Date: Tue Mar 21 10:46:38 2017 New Revision: 1008745 Log: Apache Sling Maven Sling Plugin 2.2.0 Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-2.2.0/ - copied from r1008744, websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/ Removed: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/
svn commit: r1008744 [6/8] - in /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added:
websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/install-mojo.html
==
---
websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/install-mojo.html
(added)
+++
websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/install-mojo.html
Tue Mar 21 10:45:54 2017
@@ -0,0 +1,637 @@
+
+
+http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
+
+
+
+
+
+Apache Sling Maven Sling Plugin sling:install
+
+
+
+
+
+
+
+
+Apache Sling Maven
Sling Plugin
+
+
+
+
+
+
+
+
+Last Published: 2017-03-21|
+
+ Version: 2.2.0
+
+
+
+
+
+
+ Overview
+Introduction
+Goals
+ Project Documentation
+Project Information
+Project Reports
+
+
+
+
+
+
+
+ http://maven.apache.org/; title="Built by Maven"
class="poweredBy">
+
+
+
+
+
+
+
+sling:install
+
+Full name:
+
+org.apache.sling:maven-sling-plugin:2.2.0:install
+
+Description:
+
+Install an OSGi bundle to a running Sling instance. The plugin
+places an HTTP POST request to http://felix.apache.org/documentation/subprojects/apache-felix-web-console/web-console-restful-api.html#post-requests;>Felix
+Web Console. It's also possible to HTTP PUT instead of POST
+leveraging the http://sling.apache.org/documentation/development/repository-based-development.html;>WebDAV
+bundle from Sling. Since version 2.1.8 you can also leverage
+the the http://sling.apache.org/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html;>Sling
+POST servlet for that The chosen method depends on the
+parameter deploymentMethod.
+
+Intermediate Node Creation
+
+For all deploymentMethods except WebDAV the bundle
+is not directly deployed within the OSGi container, but rather
+being uploaded to the JCR and from there on being picked up by the
+https://sling.apache.org/documentation/bundles/jcr-installer-provider.html;>JCR
+Installer Provider asynchronously, which takes care of
+deploying it in the OSGi container. For both other deployment
+methods, intermediate nodes (i.e. inexisting parent nodes) are
+automatically created. The primary type of those intermediate nodes
+depend on the deployment method.
+
+
+
+WebDAV, uses the configured collection node type, by default
+sling:Folder (see also https://sling.apache.org/documentation/development/repository-based-development.html;>WebDAV
+Configuration)
+
+SlingPostServlet, uses internally
+ResourceResolverFactory.create(...) without setting
+any jcr:primaryType. Therefore the
+JcrResourceProviderFactory will call
+Node.addNode(String relPath) which determines a
+fitting node type automatically, depending on the parents node type
+definition (see http://www.day.com/specs/jsr170/javadocs/jcr-2.0/javax/jcr/Node.html#addNode%28java.lang.String%29;>Javadoc).
+So in most of the cases this should be a sling:Folder,
+as this is the first allowed child node definition in
+sling:Folder. This only may differ, if your existing
+parent node is not of type sling:Folder itself.
+
+
+Attributes:
+
+
+
+Requires a Maven project to be executed.
+
+Binds by default to the http://maven.apache.org/ref/current/maven-core/lifecycles.html;>lifecycle
phase: install.
+
+
+
+Required Parameters
+
+
+
+
+
+Name
+
+Type
+
+Since
+
+Description
+
+
+
+
+bundleFileName
+
+String
+
+-
+
+The name of the generated JAR file.Default value is:
${project.build.directory}/${project.build.finalName}.jar.User property is: sling.file.
+
+
+
+
+bundleStart
+
+boolean
+
+-
+
+Whether to start the uploaded bundle or not. Only applies when
+POSTing to Felix Web ConsoleDefault value is: true.User property is: sling.bundle.start.
+
+
+
+
+bundleStartLevel
+
+String
+
+-
+
+The start level to set on the installed bundle. If the bundle is
+already installed and therefore is only updated this parameter is
+ignored. The parameter is also ignored if the running Sling
+instance has no StartLevel service (which is unusual actually).
+Only applies when POSTing to Felix Web Console.Default value is:
20.User property is:
sling.bundle.startlevel.
+
+
+
+
+failOnError
+
+boolean
+
+-
+
+Determines whether or not to fail the build if the HTTP POST or PUT
svn commit: r1008744 [2/8] - in /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html == --- websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html (added) +++ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html Tue Mar 21 10:45:54 2017 @@ -0,0 +1,2506 @@ + + +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + + + + + +Apache Sling Maven Sling Plugin Project Dependencies + + + + + + + + +Apache Sling Maven Sling Plugin + + + + + + + + +Last Published: 2017-03-21| + + Version: 2.2.0 + + + + + + + Overview +Introduction +Goals + Project Documentation +Project Information + +Dependencies + +Dependency Information +Dependency Management +Distribution Management +About +Issue Management +Licenses +Mailing Lists +Plugin Management +Plugins +Team +Source Code Management +Summary + + +Project Reports + + + + + + + + http://maven.apache.org/; title="Built by Maven" class="poweredBy"> + + + + + + +Project Dependencies + +compile +The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application: + + +GroupId +ArtifactId +Version +Type +Licenses + +asm +http://asm.objectweb.org/asm-all/;>asm-all +3.3.1 +jar +http://asm.objectweb.org/license.html;>BSD + +commons-httpclient +http://jakarta.apache.org/httpcomponents/httpclient-3.x/;>commons-httpclient +3.1 +jar +http://www.apache.org/licenses/LICENSE-2.0;>Apache License + +commons-io +http://commons.apache.org/proper/commons-io/;>commons-io +2.5 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 + +commons-logging +http://jakarta.apache.org/commons/logging/;>commons-logging +1.0.4 +jar +/LICENSE.txt + +javax.jcr +http://www.jcp.org/en/jsr/detail?id=283;>jcr +2.0 +jar +http://www.day.com/dam/day/downloads/jsr283/day-spec-license.htm;>Day Specification License-http://www.day.com/content/dam/day/downloads/jsr283/LICENSE.txt;>Day Specification License addendum + +net.sf.scannotation +http://scannotation.sf.net;>scannotation +1.0.2 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License V2.0 + +org.apache.commons +http://commons.apache.org/proper/commons-lang/;>commons-lang3 +3.5 +jar +https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 + +org.apache.geronimo.specs +http://geronimo.apache.org/maven/specs/geronimo-json_1.0_spec/1.0-alpha-1;>geronimo-json_1.0_spec +1.0-alpha-1 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 + +org.apache.jackrabbit.vault +http://www.apache.org/parent/org.apache.jackrabbit.vault/;>org.apache.jackrabbit.vault +3.1.18 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 + +org.apache.johnzon +http://johnzon.apache.org/johnzon-core;>johnzon-core +1.0.0 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 + +org.apache.maven +http://maven.apache.org/shared/maven-archiver/;>maven-archiver +2.6 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 + +org.apache.maven +http://maven.apache.org/maven2/maven-plugin-api/;>maven-plugin-api +2.0 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 + +org.apache.sling +http://sling.apache.org/adapter-annotations;>adapter-annotations +1.0.0 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 + +org.apache.sling +http://sling.apache.org/org.apache.sling.commons.osgi;>org.apache.sling.commons.osgi +2.4.0 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 + +test +The following is a list of test dependencies for this project. These dependencies are only required to compile and run unit tests for the application: + + +GroupId +ArtifactId +Version +Type +Licenses + +com.google.guava +http://code.google.com/p/guava-libraries/guava;>guava +15.0 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 + +provided +The following is a list of provided dependencies for this project. These dependencies are required to compile the application, but should be provided by default when using the library: + + +GroupId +ArtifactId +Version +Type +Licenses + +org.apache.maven.plugin-tools
svn commit: r1008744 [7/8] - in /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/plugin-management.html == --- websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/plugin-management.html (added) +++ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/plugin-management.html Tue Mar 21 10:45:54 2017 @@ -0,0 +1,267 @@ + + +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + + + + + +Apache Sling Maven Sling Plugin Project Plugin Management + + + + + + + + +Apache Sling Maven Sling Plugin + + + + + + + + +Last Published: 2017-03-21| + + Version: 2.2.0 + + + + + + + Overview +Introduction +Goals + Project Documentation +Project Information + +Dependencies +Dependency Information +Dependency Management +Distribution Management +About +Issue Management +Licenses +Mailing Lists +Plugin Management + +Plugins +Team +Source Code Management +Summary + + +Project Reports + + + + + + + + http://maven.apache.org/; title="Built by Maven" class="poweredBy"> + + + + + +Project Plugin Management + + +GroupId +ArtifactId +Version + +biz.aQute.bnd +http://bnd.bndtools.org/bnd-maven-plugin/;>bnd-maven-plugin +3.2.0 + +org.apache.felix +http://felix.apache.org/maven-bundle-plugin/;>maven-bundle-plugin +3.2.0 + +org.apache.felix +http://felix.apache.org/maven-scr-plugin/;>maven-scr-plugin +1.23.0 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-antrun-plugin/;>maven-antrun-plugin +1.8 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-assembly-plugin/;>maven-assembly-plugin +2.6 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-clean-plugin/;>maven-clean-plugin +3.0.0 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-compiler-plugin/;>maven-compiler-plugin +3.5.1 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-dependency-plugin/;>maven-dependency-plugin +2.10 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-deploy-plugin/;>maven-deploy-plugin +2.8.2 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-docck-plugin/;>maven-docck-plugin +1.1 + +org.apache.maven.plugins +http://maven.apache.org/enforcer/maven-enforcer-plugin;>maven-enforcer-plugin +1.4.1 + +org.apache.maven.plugins +http://maven.apache.org/surefire/maven-failsafe-plugin;>maven-failsafe-plugin +2.18.1 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-gpg-plugin/;>maven-gpg-plugin +1.6 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-install-plugin/;>maven-install-plugin +2.5.2 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-invoker-plugin/;>maven-invoker-plugin +2.0.0 + +org.apache.maven.plugins +https://maven.apache.org/plugins/maven-jar-plugin/;>maven-jar-plugin +3.0.2 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-javadoc-plugin/;>maven-javadoc-plugin +2.10.3 + +org.apache.maven.plugins +http://maven.apache.org/plugin-tools/maven-plugin-plugin;>maven-plugin-plugin +3.4 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-project-info-reports-plugin/;>maven-project-info-reports-plugin +2.9 + +org.apache.maven.plugins +http://maven.apache.org/maven-release/maven-release-plugin/;>maven-release-plugin +2.5.3 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-remote-resources-plugin/;>maven-remote-resources-plugin +1.5 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-resources-plugin/;>maven-resources-plugin +2.7 + +org.apache.maven.plugins +http://maven.apache.org/scm/maven-scm-plugin/;>maven-scm-plugin +1.9.4 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-scm-publish-plugin;>maven-scm-publish-plugin +1.1 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-site-plugin/;>maven-site-plugin +3.5.1 + +org.apache.maven.plugins +https://maven.apache.org/plugins/maven-source-plugin/;>maven-source-plugin +3.0.1 + +org.apache.maven.plugins +http://maven.apache.org/surefire/maven-surefire-plugin;>maven-surefire-plugin +2.18.1 + +org.apache.maven.plugins +http://maven.apache.org/surefire/maven-surefire-report-plugin/;>maven-surefire-report-plugin +2.19.1 + +org.apache.maven.plugins +http://maven.apache.org/plugins/maven-war-plugin/;>maven-war-plugin +2.6 + +org.apache.rat +http://creadur.apache.org/rat/apache-rat-plugin/;>apache-rat-plugin +0.11 + +org.apache.servicemix.tooling
svn commit: r1008744 [4/8] - in /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg == --- websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg (added) +++ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg Tue Mar 21 10:45:54 2017 @@ -0,0 +1,229 @@ + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd; > +http://www.w3.org/2000/svg;> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg -- svn:eol-style = native Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg -- --- svn:keywords (added) +++ svn:keywords Tue Mar 21 10:45:54 2017 @@ -0,0 +1 @@ +LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg -- svn:mime-type = text/plain Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.ttf == Binary file - no diff available. Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.ttf -- svn:mime-type = application/octet-stream Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.woff == Binary file - no diff available. Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.woff -- svn:mime-type = application/octet-stream Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html == --- websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html (added) +++ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html Tue Mar 21 10:45:54 2017 @@ -0,0 +1,376 @@ + + +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + + + + + +Apache Sling Maven Sling Plugin sling:fsmount + + + + + + + + +Apache Sling Maven Sling Plugin + + + + + + + + +Last Published: 2017-03-21| + + Version: 2.2.0 + + + + + + + Overview +Introduction +Goals + Project Documentation +Project Information +Project Reports + + + + + + + + http://maven.apache.org/; title="Built by Maven" class="poweredBy"> + + + + + + + +sling:fsmount + +Full name: + +org.apache.sling:maven-sling-plugin:2.2.0:fsmount + +Description: + +Creates OSGi configurations for the https://sling.apache.org/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html;>Apache +Sling File System Resource Provider. + +Attributes: + + + +Requires a Maven project to be executed. + + + +Required Parameters + + + + + +Name + +Type + +Since + +Description + + + + +bundleFileName + +String +
svn commit: r1008744 [1/8] - in /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Author: sseifert Date: Tue Mar 21 10:45:54 2017 New Revision: 1008744 Log: Site checkin for project Apache Sling Maven Sling Plugin Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/css/ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/css/apache-maven-fluido-1.6.min.css (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/css/print.css (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/css/site.css (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/deploy-file-mojo.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/deploy-mojo.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/distribution-management.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.eot (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.ttf (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.woff (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/generate-adapter-metadata-mojo.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/help-mojo.html (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/accessories-text-editor.png (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/add.gif (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/apache-maven-project-2.png (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/application-certificate.png (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/close.gif (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/contact-new.png (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/document-properties.png (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/drive-harddisk.png (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/fix.gif (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_error_sml.gif (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_help_sml.gif (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_info_sml.gif (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_success_sml.gif (with props) websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_warning_sml.gif (with props
svn commit: r1008744 [8/8] - in /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/uninstall-mojo.html == --- websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/uninstall-mojo.html (added) +++ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/uninstall-mojo.html Tue Mar 21 10:45:54 2017 @@ -0,0 +1,570 @@ + + +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + + + + + +Apache Sling Maven Sling Plugin sling:uninstall + + + + + + + + +Apache Sling Maven Sling Plugin + + + + + + + + +Last Published: 2017-03-21| + + Version: 2.2.0 + + + + + + + Overview +Introduction +Goals + Project Documentation +Project Information +Project Reports + + + + + + + + http://maven.apache.org/; title="Built by Maven" class="poweredBy"> + + + + + + + +sling:uninstall + +Full name: + +org.apache.sling:maven-sling-plugin:2.2.0:uninstall + +Description: + +Uninstall an OSGi bundle from a running Sling instance. The plugin +places by default an HTTP POST request to http://felix.apache.org/documentation/subprojects/apache-felix-web-console/web-console-restful-api.html#post-requests;>Felix +Web Console to uninstall the bundle. It's also possible to use +HTTP DELETE leveraging the http://sling.apache.org/documentation/development/repository-based-development.html;>WebDAV +bundle from Sling. or the http://sling.apache.org/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html;>Sling +POST servlet to uninstall the bundle. The chosen method depends +on the parameter deploymentMethod. + +Attributes: + + + +Requires a Maven project to be executed. + + + +Required Parameters + + + + + +Name + +Type + +Since + +Description + + + + +bundleStart + +boolean + +- + +Whether to start the uploaded bundle or not. Only applies when +POSTing to Felix Web ConsoleDefault value is: true.User property is: sling.bundle.start. + + + + +bundleStartLevel + +String + +- + +The start level to set on the installed bundle. If the bundle is +already installed and therefore is only updated this parameter is +ignored. The parameter is also ignored if the running Sling +instance has no StartLevel service (which is unusual actually). +Only applies when POSTing to Felix Web Console.Default value is: 20.User property is: sling.bundle.startlevel. + + + + +failOnError + +boolean + +- + +Determines whether or not to fail the build if the HTTP POST or PUT +returns an non-OK response code.Default value is: true.User property is: sling.failOnError. + + + + +mimeType + +String + +- + +The content type / mime type used for WebDAV or Sling POST +deployment.Default value is: application/java-archive.User property is: sling.mimeType. + + + + +mountByFS + +boolean + +- + +Whether to add the mapping for the https://sling.apache.org/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html;>Apache +Sling File System Resource Provider.Default value is: false.User property is: sling.mountByFS. + + + + +password + +String + +- + +The password to authenticate at the running Sling instance.Default value is: admin.User property is: sling.password. + + + + +refreshPackages + +boolean + +- + +Whether to refresh the packages after installing the uploaded +bundle. Only applies when POSTing to Felix Web ConsoleDefault value is: true.User property is: sling.refreshPackages. + + + + +slingUrl + +String + +- + +The URL of the running Sling instance. The default is only useful +for WebConsole deployment.Default value is: http://localhost:8080/system/console.User property is: sling.url. + + + + +user + +String + +- + +The user name to authenticate at the running Sling instance.Default value is: admin.User property is: sling.user. + + + + + +Optional Parameters +
svn commit: r1008744 [3/8] - in /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html -- svn:eol-style = native Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html -- --- svn:keywords (added) +++ svn:keywords Tue Mar 21 10:45:54 2017 @@ -0,0 +1 @@ +LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html -- svn:mime-type = text/plain Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html == --- websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html (added) +++ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html Tue Mar 21 10:45:54 2017 @@ -0,0 +1,120 @@ + + +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + + + + + +Apache Sling Maven Sling Plugin Dependency Information + + + + + + + + +Apache Sling Maven Sling Plugin + + + + + + + + +Last Published: 2017-03-21| + + Version: 2.2.0 + + + + + + + Overview +Introduction +Goals + Project Documentation +Project Information + +Dependencies +Dependency Information + +Dependency Management +Distribution Management +About +Issue Management +Licenses +Mailing Lists +Plugin Management +Plugins +Team +Source Code Management +Summary + + +Project Reports + + + + + + + + http://maven.apache.org/; title="Built by Maven" class="poweredBy"> + + + + + +Dependency Information + +Apache Maven +dependency + groupIdorg.apache.sling/groupId + artifactIdmaven-sling-plugin/artifactId + version2.2.0/version + typemaven-plugin/type +/dependency + +Apache Buildr +'org.apache.sling:maven-sling-plugin:maven-plugin:2.2.0' + +Apache Ivy +dependency org=org.apache.sling name=maven-sling-plugin rev=2.2.0 + artifact name=maven-sling-plugin type=maven-plugin / +/dependency + +Groovy Grape +@Grapes( +@Grab(group='org.apache.sling', module='maven-sling-plugin', version='2.2.0') +) + +Gradle/Grails +compile 'org.apache.sling:maven-sling-plugin:2.2.0' + +Scala SBT +libraryDependencies += org.apache.sling % maven-sling-plugin % 2.2.0 + +Leiningen +[org.apache.sling/maven-sling-plugin 2.2.0] + + + + + + + +Copyright 20072017 +https://www.apache.org/;>The Apache Software Foundation. +All rights reserved. + + + + + \ No newline at end of file Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html -- svn:eol-style = native Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html -- --- svn:keywords (added) +++ svn:keywords Tue Mar 21 10:45:54 2017 @@ -0,0 +1 @@ +LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author Propchange: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html -- svn:mime-type = text/plain Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html == --- websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html (added) +++ websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html Tue Mar 21 10:45:54 2017 @@ -0,0 +1,200 @@ + + +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + + + + + +Apache Sling Maven Sling Plugin Project Dependency Management + + + + + + + + +Apache Sling
svn commit: r1008744 [5/8] - in /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added:
websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html
==
---
websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html
(added)
+++
websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html
Tue Mar 21 10:45:54 2017
@@ -0,0 +1,376 @@
+
+
+http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
+
+
+
+
+
+Apache Sling Maven Sling Plugin sling:fsunmount
+
+
+
+
+
+
+
+
+Apache Sling Maven
Sling Plugin
+
+
+
+
+
+
+
+
+Last Published: 2017-03-21|
+
+ Version: 2.2.0
+
+
+
+
+
+
+ Overview
+Introduction
+Goals
+ Project Documentation
+Project Information
+Project Reports
+
+
+
+
+
+
+
+ http://maven.apache.org/; title="Built by Maven"
class="poweredBy">
+
+
+
+
+
+
+
+sling:fsunmount
+
+Full name:
+
+org.apache.sling:maven-sling-plugin:2.2.0:fsunmount
+
+Description:
+
+Removes OSGi configurations for the https://sling.apache.org/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html;>Apache
+Sling File System Resource Provider.
+
+Attributes:
+
+
+
+Requires a Maven project to be executed.
+
+
+
+Required Parameters
+
+
+
+
+
+Name
+
+Type
+
+Since
+
+Description
+
+
+
+
+bundleFileName
+
+String
+
+-
+
+The name of the generated JAR file.Default value is:
${project.build.directory}/${project.build.finalName}.jar.User property is: sling.file.
+
+
+
+
+failOnError
+
+boolean
+
+-
+
+Determines whether or not to fail the build if the HTTP POST or PUT
+returns an non-OK response code.Default value is:
true.User property is: sling.failOnError.
+
+
+
+
+password
+
+String
+
+-
+
+The password to authenticate at the running Sling instance.Default value is: admin.User property is:
sling.password.
+
+
+
+
+slingUrl
+
+String
+
+-
+
+The URL of the running Sling instance. The default is only useful
+for WebConsole deployment.Default value is:
http://localhost:8080/system/console.User property is:
sling.url.
+
+
+
+
+user
+
+String
+
+-
+
+The user name to authenticate at the running Sling instance.Default value is: admin.User property is:
sling.user.
+
+
+
+
+
+Optional Parameters
+
+
+
+
+
+Name
+
+Type
+
+Since
+
+Description
+
+
+
+
+fileVaultFilterXmlFile
+
+File
+
+-
+
+Path to META-INF/vault/filter.xml when using FileVault XML
+filesystem layout.User property is:
sling.filevault.filterxml.file.
+
+
+
+
+fileVaultJcrRootFile
+
+File
+
+-
+
+FileVault filesystem layout content root folder.User property
is: sling.filevault.jcr_root.file.
+
+
+
+
+slingConsoleUrl
+
+String
+
+-
+
+The WebConsole URL of the running Sling instance. This is required
+for file system provider operations. If not configured the value of
+slingUrl is used.User property is:
sling.console.url.
+
+
+
+
+slingUrlSuffix
+
+String
+
+-
+
+An optional url suffix which will be appended to the
+sling.url for use as the real target url. This allows
+to configure different target URLs in each POM, while using the
+same common sling.url in a parent POM (eg.
+sling.url=http://localhost:8080 and
+sling.urlSuffix=/project/specific/path). This is
+typically used in conjunction with WebDAV or SlingPostServlet
+deployment methods.User property is:
sling.urlSuffix.
+
+
+
+
+
+Parameter Details
+
+bundleFileName:
+
+The name of the generated JAR file.
+
+
+
+Type: java.lang.String
+
+Required: Yes
+
+User Property: sling.file
+
+Default:
${project.build.directory}/${project.build.finalName}.jar
+
+failOnError:
+
+Determines whether or not to fail the build if the HTTP POST or PUT
+returns an non-OK response
svn commit: r1008743 - /websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/
Author: sseifert Date: Tue Mar 21 10:45:20 2017 New Revision: 1008743 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST Added: websites/production/sling/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/
