[sling-org-apache-sling-caconfig-impl] branch master updated: SLING-7230 CAConfig Impl: Allow to configure alterantive lookup resource names for configuration collection properties
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git
The following commit(s) were added to refs/heads/master by this push:
new 3e2166c SLING-7230 CAConfig Impl: Allow to configure alterantive
lookup resource names for configuration collection properties
3e2166c is described below
commit 3e2166c03caa92eaacfc16daa099670b5b10030b
Author: sseifert <sseif...@pro-vision.de>
AuthorDate: Mon Nov 6 18:11:42 2017 +0100
SLING-7230 CAConfig Impl: Allow to configure alterantive lookup resource
names for configuration collection properties
---
.../management/ConfigurationManagementSettings.java | 6 ++
.../impl/ConfigurationManagementSettingsImpl.java | 21 +
.../management/impl/ConfigurationManagerImpl.java | 8 +++-
.../sling/caconfig/management/package-info.java | 2 +-
.../ConfigurationManagementSettingsImplTest.java| 14 +++---
...figurationManagerImplCustomPersistence2Test.java | 14 ++
.../impl/ConfigurationManagerImplTest.java | 14 --
.../CustomConfigurationPersistenceStrategy2.java| 3 ++-
8 files changed, 70 insertions(+), 12 deletions(-)
diff --git
a/src/main/java/org/apache/sling/caconfig/management/ConfigurationManagementSettings.java
b/src/main/java/org/apache/sling/caconfig/management/ConfigurationManagementSettings.java
index 7a0fc82..0b865cf 100644
---
a/src/main/java/org/apache/sling/caconfig/management/ConfigurationManagementSettings.java
+++
b/src/main/java/org/apache/sling/caconfig/management/ConfigurationManagementSettings.java
@@ -18,6 +18,7 @@
*/
package org.apache.sling.caconfig.management;
+import java.util.Collection;
import java.util.Set;
import org.osgi.annotation.versioning.ProviderType;
@@ -34,5 +35,10 @@ public interface ConfigurationManagementSettings {
* @return Property names that should be ignored/filtered out from the
given set of property names.
*/
Set getIgnoredPropertyNames(Set propertyNames);
+
+/**
+ * @return Config collection parent properties resource names.
+ */
+Collection getConfigCollectionPropertiesResourceNames();
}
diff --git
a/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagementSettingsImpl.java
b/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagementSettingsImpl.java
index 11807df..94a99e0 100644
---
a/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagementSettingsImpl.java
+++
b/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagementSettingsImpl.java
@@ -19,6 +19,9 @@
package org.apache.sling.caconfig.management.impl;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -48,11 +51,17 @@ public class ConfigurationManagementSettingsImpl implements
ConfigurationManagem
"^jcr:.+$"
};
+@AttributeDefinition(name="Config collection parent properties
resource names",
+description = "Names of resource to try to look up
configuration collection properties in. If list is empty only the collection
parent resource is checked." +
+ " If the list is not empty than only those
listed resources are used for look up. If you want to include the collection
parent resource you can use a dot for the value.")
+String[] configCollectionPropertiesResourceNames();
+
}
private static final Logger log =
LoggerFactory.getLogger(ConfigurationManagementSettingsImpl.class);
private Pattern[] ignorePropertyNameRegex;
+private Collection configCollectionPropertiesResourceNames;
@Activate
@@ -66,7 +75,14 @@ public class ConfigurationManagementSettingsImpl implements
ConfigurationManagem
log.warn("Ignoring invalid regex pattern: " + patternString,
ex);
}
}
+
this.ignorePropertyNameRegex = patterns.toArray(new
Pattern[patterns.size()]);
+
+String[] configCollectionPropertiesResourceNames =
config.configCollectionPropertiesResourceNames();
+if (configCollectionPropertiesResourceNames == null ||
configCollectionPropertiesResourceNames.length == 0) {
+configCollectionPropertiesResourceNames = new String[] { "." };
+}
+this.configCollectionPropertiesResourceNames =
Collections.unmodifiableList(Arrays.asList(configCollectionPropertiesResourceNames));
}
@Override
@@ -83,4 +99,9 @@ public class ConfigurationManagementSettingsImpl implements
ConfigurationManagem
return ignoredPropertyNames;
}
+@Override
[sling-org-apache-sling-testing-sling-mock-oak] 01/01: import branch for 1.x from svn
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch release/1.x
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git
commit bca1826ec674f3762fdd8b57b9bf13ffabc231be
Author: sseifert <sseif...@pro-vision.de>
AuthorDate: Mon Nov 6 17:15:54 2017 +0100
import branch for 1.x from svn
---
pom.xml| 121 -
.../mock/sling/oak/OakMockSlingRepository.java | 27 ++---
.../sling/testing/mock/sling/oak/package-info.java | 2 +-
3 files changed, 84 insertions(+), 66 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2196868..e0df266 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,21 +23,21 @@
org.apache.sling
sling
-30
+26
org.apache.sling.testing.sling-mock-oak
-2.0.3-SNAPSHOT
+1.0.3-SNAPSHOT
bundle
-Apache Sling Testing Sling Mock Jackrabbit Oak-based Resource
Resolver
+Apache Sling Testing Sling Mock Oak-based Resource Resolver
Implements a resource resolver type for Jackrabbit Oak that
can be used in unit tests based on Sling Mocks.
-1.4.1
-2.12.1
-2.2.12
+1.2.2
+2.10.1
+1.9.6
@@ -83,15 +83,10 @@
${jackrabbit.version}
-
javax.jcr
jcr
-compile
-
-
-javax.servlet
-javax.servlet-api
+2.0
compile
@@ -109,7 +104,7 @@
org.apache.sling
org.apache.sling.testing.logging-mock
-2.0.0
+1.0.0
test
@@ -118,42 +113,68 @@
-
-org.apache.felix
-maven-bundle-plugin
-true
-
-
-
-org.apache.maven.plugins
-maven-shade-plugin
-2.4.3
-
-
-
-
-org.apache.jackrabbit:*
-
-
-true
-
-
-
-package
-
-shade
-
-
-
-
-
-
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
+ test-jar
+
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+true
+
+
+
+org.apache.felix
+maven-scr-plugin
+
+
+generate-scr-scrdescriptor
+
+ scr
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 2.4.1
+
+
+
+
+org.apache.jackrabbit:*
+
+
+true
+
+
+
+package
+
+shade
+
+
+
+
+
+
org.apache.rat
apache-rat-plugin
@@ -161,7 +182,7 @@
dependency-reduced-pom.xml
-
+
diff --git
a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
index c78bf00..f786e6c 100644
---
a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
+++
b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
@@ -33,19 +33,21 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.jcr.Value;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.api.JackrabbitRepository;
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.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-
[sling-org-apache-sling-testing-sling-mock-oak] branch release/1.x created (now bca1826)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch release/1.x in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git. at bca1826 import branch for 1.x from svn This branch includes the following new commits: new bca1826 import branch for 1.x from svn The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-testing-sling-mock] 01/01: import branch for 1.x from svn
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch release/1.x in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git commit 44f2981b262f1719acc9fb8e7cfba4d5864f73ac Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 17:14:09 2017 +0100 import branch for 1.x from svn --- pom.xml| 125 ++ .../testing/mock/sling/MockAdapterManagerImpl.java | 181 + .../mock/sling/MockDynamicClassLoaderManager.java | 33 .../testing/mock/sling/MockJcrSlingRepository.java | 14 +- .../apache/sling/testing/mock/sling/MockSling.java | 67 .../sling/ResourceResolverFactoryInitializer.java | 89 ++ .../testing/mock/sling/ResourceResolverType.java | 14 ++ .../sling/ThreadsafeMockAdapterManagerWrapper.java | 2 +- .../testing/mock/sling/builder/package-info.java | 2 +- .../context/ContextResourceResolverFactory.java| 7 + .../sling/context/ModelAdapterFactoryUtil.java | 32 ++-- .../mock/sling/context/SlingContextImpl.java | 44 ++--- .../testing/mock/sling/context/UniqueRoot.java | 11 +- .../testing/mock/sling/context/package-info.java | 2 +- .../testing/mock/sling/junit/SlingContext.java | 3 +- .../mock/sling/junit/SlingContextBuilder.java | 3 +- .../mock/sling/junit/SlingContextCallback.java | 3 +- .../testing/mock/sling/junit/package-info.java | 2 +- .../testing/mock/sling/loader/ContentLoader.java | 2 +- .../testing/mock/sling/loader/package-info.java| 2 +- .../sling/testing/mock/sling/package-info.java | 2 +- .../mock/sling/services/MockMimeTypeService.java | 6 +- .../testing/mock/sling/services/package-info.java | 2 +- .../sling/servlet/MockSlingHttpServletRequest.java | 23 ++- .../testing/mock/sling/servlet/package-info.java | 2 +- .../sling/testing/mock/sling/spi/package-info.java | 2 +- .../mock/sling/NodeTypeDefinitionScannerTest.java | 1 + .../context/AbstractSlingContextImplTest.java | 9 +- .../sling/context/NoResourceResolverTypeTest.java | 18 +- .../testing/mock/sling/junit/SlingContextTest.java | 81 + .../sling/resource/AbstractJcrNamespaceTest.java | 5 +- .../resource/AbstractJcrResourceResolverTest.java | 6 +- .../AbstractSlingCrudResourceResolverTest.java | 18 +- 33 files changed, 392 insertions(+), 421 deletions(-) diff --git a/pom.xml b/pom.xml index f028e74..2f4503f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ org.apache.sling sling -30 +26 org.apache.sling.testing.sling-mock -2.2.15-SNAPSHOT +1.9.11-SNAPSHOT bundle Apache Sling Testing Sling Mock @@ -45,7 +45,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.3.4 +1.9.8 compile @@ -63,70 +63,63 @@ org.apache.sling org.apache.sling.servlet-helpers -1.1.2 -compile - - - -org.apache.sling -org.apache.sling.commons.osgi -2.4.0 +1.0.2 compile org.apache.sling org.apache.sling.models.api -1.2.2 +1.1.0 compile org.apache.sling org.apache.sling.models.impl -1.2.2 +1.1.0 compile org.apache.sling org.apache.sling.api -2.11.0 +2.4.0 compile org.apache.sling org.apache.sling.resourceresolver -1.4.8 +1.1.0 compile org.apache.sling org.apache.sling.jcr.api -2.3.0 +2.2.0 compile org.apache.sling org.apache.sling.jcr.resource -2.7.4 +2.3.6 compile org.apache.sling org.apache.sling.scripting.api -2.1.8 +2.1.6 compile org.apache.sling org.apache.sling.scripting.core -2.0.36 +2.0.26 compile org.apache.sling org.apache.sling.commons.mime -2.1.8 +2.1.4 compile @@ -143,26 +136,26 @@ org.apache.sling -org.apache.sling.commons.classloader -1.3.2 +org.apache.sling.commons.osgi +2.2.0 compile org.apache
[sling-org-apache-sling-testing-sling-mock] branch release/1.x created (now 44f2981)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch release/1.x in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git. at 44f2981 import branch for 1.x from svn This branch includes the following new commits: new 44f2981 import branch for 1.x from svn The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-testing-osgi-mock] branch release/1.x created (now b884265)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch release/1.x in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git. at b884265 import branch for 1.x from svn This branch includes the following new commits: new b884265 import branch for 1.x from svn The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-testing-osgi-mock] 01/01: import branch for 1.x from svn
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch release/1.x in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git commit b884265f34da72b15fd2f39429b1e83fb0b301ba Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 17:10:53 2017 +0100 import branch for 1.x from svn --- pom.xml| 137 +++- .../sling/testing/mock/osgi/MapMergeUtil.java | 21 +- .../apache/sling/testing/mock/osgi/MapUtil.java| 4 +- .../sling/testing/mock/osgi/MatchAllFilter.java| 6 - .../apache/sling/testing/mock/osgi/MockBundle.java | 44 +-- .../sling/testing/mock/osgi/MockBundleContext.java | 143 .../testing/mock/osgi/MockComponentContext.java| 4 +- .../sling/testing/mock/osgi/MockConfiguration.java | 7 +- .../sling/testing/mock/osgi/MockEventAdmin.java| 26 +- .../apache/sling/testing/mock/osgi/MockOsgi.java | 87 - .../testing/mock/osgi/MockServiceReference.java| 16 +- .../testing/mock/osgi/MockServiceRegistration.java | 28 +- .../sling/testing/mock/osgi/OsgiMetadataUtil.java | 18 +- .../sling/testing/mock/osgi/OsgiServiceUtil.java | 370 + .../mock/osgi/context/AbstractContextPlugin.java | 2 +- .../testing/mock/osgi/context/ContextCallback.java | 2 +- .../testing/mock/osgi/context/ContextPlugin.java | 2 +- .../testing/mock/osgi/context/ContextPlugins.java | 6 +- .../testing/mock/osgi/context/OsgiContextImpl.java | 3 +- .../testing/mock/osgi/context/package-info.java| 2 +- .../sling/testing/mock/osgi/junit/OsgiContext.java | 3 +- .../mock/osgi/junit/OsgiContextBuilder.java| 7 +- .../mock/osgi/junit/OsgiContextCallback.java | 3 +- .../testing/mock/osgi/junit/package-info.java | 2 +- .../sling/testing/mock/osgi/package-info.java | 2 +- ...ckBundleContextDynamicReferencesOsgiR6Test.java | 188 --- ...ockBundleContextStaticGreedyReferencesTest.java | 2 +- .../testing/mock/osgi/MockBundleContextTest.java | 94 ++ .../mock/osgi/MockComponentContextTest.java| 2 +- .../mock/osgi/MockServiceReferencesSortTest.java | 78 ++--- .../OsgiServiceUtilActivateDeactivateTest.java | 76 + .../testing/mock/osgi/OsgiServiceUtilTest.java | 121 ++- .../mock/osgi/context/OsgiContextImplTest.java | 8 +- .../testing/mock/osgi/junit/OsgiContextTest.java | 1 + osgi.OsgiServiceUtilActivateDeactivateTest.xml | 3 - ...sling.testing.mock.osgi.OsgiServiceUtilTest.xml | 9 - 36 files changed, 446 insertions(+), 1081 deletions(-) diff --git a/pom.xml b/pom.xml index 2fa57e7..7dfef63 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ org.apache.sling sling -30 +26 org.apache.sling.testing.osgi-mock -2.3.5-SNAPSHOT +1.9.9-SNAPSHOT bundle Apache Sling Testing OSGi Mock @@ -44,12 +44,26 @@ org.osgi -osgi.core +org.osgi.core compile org.osgi -osgi.cmpn +org.osgi.compendium +compile + + + +org.apache.sling +org.apache.sling.commons.osgi +2.2.0 +compile + + + +org.apache.felix +org.apache.felix.framework +5.0.0 compile @@ -78,7 +92,7 @@ slf4j-api compile - + org.reflections reflections @@ -110,28 +124,6 @@ - - -org.apache.sling -org.apache.sling.commons.osgi -2.4.0 -compile - - - -org.apache.felix -org.apache.felix.framework -5.0.0 -compile - - - -org.apache.felix -org.apache.felix.scr -2.0.4 -compile - - org.mockito mockito-all @@ -146,7 +138,7 @@ org.apache.sling org.apache.sling.testing.logging-mock -2.0.0 +1.0.0 test @@ -161,6 +153,11 @@ true + +org.apache.felix +maven-scr-plugin + + org.apache.rat apache-rat-plugin @@ -169,73 +166,31 @@ src/test/resources/META-INF/test.txt src/test/resources/bundleData/nested/first.txt src/test/resources/bundleData/nested/second.txt -dependency-reduced-p
[sling-org-apache-sling-servlet-helpers] 01/01: import branch for 1.0.x from svn
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch release/1.0.x
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git
commit a8cc76302c139e402cc1e468dad7074400cd7ca2
Author: sseifert <sseif...@pro-vision.de>
AuthorDate: Mon Nov 6 17:08:18 2017 +0100
import branch for 1.0.x from svn
---
pom.xml| 5 +-
.../sling/servlethelpers/MockHttpSession.java | 3 +-
.../MockRequestDispatcherFactory.java | 3 +-
.../sling/servlethelpers/MockRequestPathInfo.java | 3 +-
.../sling/servlethelpers/MockServletContext.java | 7 +--
.../MockSlingHttpServletRequest.java | 64 ++
.../MockSlingHttpServletResponse.java | 8 +--
.../sling/servlethelpers/ResponseBodySupport.java | 9 ---
.../apache/sling/servlethelpers/package-info.java | 2 +-
.../sling/servlethelpers/MockHttpSessionTest.java | 1 +
.../servlethelpers/MockRequestPathInfoTest.java| 1 +
.../servlethelpers/MockServletContextTest.java | 1 +
.../MockSlingHttpServletRequestTest.java | 40 +-
.../MockSlingHttpServletResponseTest.java | 1 +
14 files changed, 24 insertions(+), 124 deletions(-)
diff --git a/pom.xml b/pom.xml
index 23ea199..579816c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,13 +23,13 @@
org.apache.sling
sling
-30
+26
org.apache.sling.servlet-helpers
bundle
-1.1.3-SNAPSHOT
+1.0.3-SNAPSHOT
Apache Sling Servlet Helpers
Mock implementations of SlingHttpServletRequest,
SlingHttpServletResponse and related classes.
@@ -55,6 +55,7 @@
javax.servlet
javax.servlet-api
+3.0.1
provided
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
b/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
index bcaae1e..31d672b 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
@@ -27,7 +27,8 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import org.apache.commons.collections.IteratorUtils;
-import org.osgi.annotation.versioning.ConsumerType;
+
+import aQute.bnd.annotation.ConsumerType;
/**
* Mock {@link HttpSession} implementation.
diff --git
a/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
b/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
index d3dbe38..5664035 100644
---
a/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
+++
b/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
@@ -22,7 +22,8 @@ import javax.servlet.RequestDispatcher;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.resource.Resource;
-import org.osgi.annotation.versioning.ConsumerType;
+
+import aQute.bnd.annotation.ConsumerType;
/**
* Interface to create a mock {@link RequestDispatcher} when calling the
getRequestDispatcher methods
diff --git
a/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
b/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
index d14034c..4c6439d 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
@@ -21,7 +21,8 @@ package org.apache.sling.servlethelpers;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
-import org.osgi.annotation.versioning.ConsumerType;
+
+import aQute.bnd.annotation.ConsumerType;
/**
* Mock {@link RequestPathInfo} implementation.
diff --git
a/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
b/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
index 108facb..4741738 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
@@ -37,7 +37,7 @@ import javax.servlet.SessionCookieConfig;
import javax.servlet.SessionTrackingMode;
import javax.servlet.descriptor.JspConfigDescriptor;
-import org.osgi.annotation.versioning.ConsumerType;
+import aQute.bnd.annotation.ConsumerType;
/**
* Mock {@link ServletContext} implementation.
@@ -301,9 +301,4 @@ public class MockServletContext implements ServletContext {
throw new UnsupportedOperationException();
}
-@Override
-public String getVirtualServerName() {
-throw new UnsupportedOperationException();
-}
-
}
diff --git
a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
b/sr
[sling-org-apache-sling-servlet-helpers] branch release/1.0.x created (now a8cc763)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch release/1.0.x in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git. at a8cc763 import branch for 1.0.x from svn This branch includes the following new commits: new a8cc763 import branch for 1.0.x from svn The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-fsresource] 01/01: import branch for 1.x from svn
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch release/1.x
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 4abf59cf41b40366ceffe3e455296f822ec39db7
Author: sseifert <sseif...@pro-vision.de>
AuthorDate: Mon Nov 6 17:03:26 2017 +0100
import branch for 1.x from svn
---
pom.xml| 22 ++--
.../sling/fsprovider/internal/FileMonitor.java | 95 +---
.../apache/sling/fsprovider/internal/FsMode.java | 2 +-
.../fsprovider/internal/FsResourceProvider.java| 125 ++---
.../internal/mapper/ContentFileResource.java | 5 +-
.../fsprovider/internal/mapper/FileResource.java | 24 ++--
.../internal/mapper/FileResourceMapper.java| 11 +-
.../internal/mapper/FileVaultResourceMapper.java | 5 +-
.../internal/parser/ContentElementImpl.java| 2 +-
.../sling/fsprovider/internal/FileMonitorTest.java | 53 +
.../fsprovider/internal/FileVaultContentTest.java | 14 +--
.../internal/FileVaultFileMonitorTest.java | 59 +-
.../fsprovider/internal/JcrXmlContentTest.java | 15 ++-
.../sling/fsprovider/internal/JsonContentTest.java | 19 ++--
.../sling/fsprovider/internal/TestUtils.java | 29 +++--
15 files changed, 239 insertions(+), 241 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc0b0d2..e1f065c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
org.apache.sling.fsresource
bundle
-2.1.9-SNAPSHOT
+1.4.9-SNAPSHOT
Apache Sling File System Resource Provider
@@ -87,12 +87,14 @@
javax.servlet
-javax.servlet-api
+servlet-api
+2.4
+provided
org.apache.sling
org.apache.sling.api
-2.11.0
+2.4.0
org.apache.sling
@@ -104,8 +106,8 @@
osgi.core
-org.slf4j
-slf4j-api
+org.osgi
+osgi.cmpn
org.apache.commons
@@ -157,13 +159,19 @@
org.apache.sling
org.apache.sling.testing.sling-mock
-2.2.6
+1.9.6
+test
+
+
+org.apache.sling
+org.apache.sling.testing.osgi-mock
+2.2.4
test
org.apache.sling
org.apache.sling.testing.logging-mock
-2.0.0
+1.0.0
test
diff --git
a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
index a164d4f..88c9d6f 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
@@ -18,8 +18,17 @@
*/
package org.apache.sling.fsprovider.internal;
+import static org.apache.sling.api.SlingConstants.PROPERTY_PATH;
+import static org.apache.sling.api.SlingConstants.PROPERTY_RESOURCE_TYPE;
+import static org.apache.sling.api.SlingConstants.TOPIC_RESOURCE_ADDED;
+import static org.apache.sling.api.SlingConstants.TOPIC_RESOURCE_CHANGED;
+import static org.apache.sling.api.SlingConstants.TOPIC_RESOURCE_REMOVED;
+
import java.io.File;
import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Timer;
@@ -27,13 +36,12 @@ import java.util.TimerTask;
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
-import org.apache.sling.api.resource.observation.ResourceChange;
-import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
import org.apache.sling.fsprovider.internal.mapper.ContentFile;
+import org.apache.sling.fsprovider.internal.mapper.FileResource;
import org.apache.sling.fsprovider.internal.parser.ContentElement;
+import org.apache.sling.fsprovider.internal.parser.ContentElementImpl;
import org.apache.sling.fsprovider.internal.parser.ContentFileCache;
-import org.apache.sling.spi.resource.provider.ObservationReporter;
-import org.apache.sling.spi.resource.provider.ObserverConfiguration;
+import org.osgi.service.event.EventAdmin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -126,8 +134,8 @@ public final class FileMonitor extends TimerTask {
}
synchronized ( this ) {
try {
-// if we don't have an observation reporter, we just skip the
check
-final ObservationReporter reporter =
this.provider.getObservationReporter();
+// if we don't have an event admin, we just skip the check
+final EventAdmin re
[sling-org-apache-sling-fsresource] branch release/1.x created (now 4abf59c)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch release/1.x in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git. at 4abf59c import branch for 1.x from svn This branch includes the following new commits: new 4abf59c import branch for 1.x from svn The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-fsresource] branch master updated: add documentation link
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git The following commit(s) were added to refs/heads/master by this push: new 53d2f7f add documentation link 53d2f7f is described below commit 53d2f7fe2b828ce1884f1c1153549d6d711cf9aa Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 17:01:12 2017 +0100 add documentation link --- README.md | 5 + 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 83e62b7..2b2a314 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ # Apache Sling File System Resource Provider This module is part of the [Apache Sling](https://sling.apache.org) project. + +Provides a ResourceProvider implementation supporting file system based resources. + +Documentation: +https://sling.apache.org/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-testing-sling-mock-oak] branch master updated: sling-mock-oak no longer experimental
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git The following commit(s) were added to refs/heads/master by this push: new 7b7222d sling-mock-oak no longer experimental 7b7222d is described below commit 7b7222d47b8a87dc213bbee2220113c1dd2bf2d2 Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:56:54 2017 +0100 sling-mock-oak no longer experimental --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index fbc70b3..9fa960f 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,5 @@ Implements a resource resolver type for Jackrabbit Oak that can be used in unit This is a separate maven artifacts because it introduces a lot of further dependencies. -Please note: This adapter for Jackrabbit Oak is still experimental, not all sling-mock features are working. -(see disabled unit tests with comments) - Documentation: http://sling.apache.org/documentation/development/sling-mock.html -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-testing-resourceresolver-mock] branch master updated: consolidate README
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git The following commit(s) were added to refs/heads/master by this push: new e5af6e6 consolidate README e5af6e6 is described below commit e5af6e60057fb0b3abbe6e370081e78f2d82bcf7 Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:55:53 2017 +0100 consolidate README --- README.md | 5 + README.txt | 6 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4abf793..ba8cf16 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ # Apache Sling Testing Resource Resolver Mock This module is part of the [Apache Sling](https://sling.apache.org) project. + +Mock for the resource resolver / factory for easier testing. + +Documentation: +http://sling.apache.org/documentation/development/resourceresolver-mock.html diff --git a/README.txt b/README.txt deleted file mode 100644 index b6e31db..000 --- a/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -Apache Sling Testing Resource Resolver Mock - -Mock for the resource resolver / factory for easier testing. - -Documentation: -http://sling.apache.org/documentation/development/resourceresolver-mock.html -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-testing-sling-mock-oak] branch master updated: ignore dependency-reduced-pom.xml
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git The following commit(s) were added to refs/heads/master by this push: new 11058db ignore dependency-reduced-pom.xml 11058db is described below commit 11058db5288f44b1d96d0b4884943b922e5cb8e6 Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:54:21 2017 +0100 ignore dependency-reduced-pom.xml --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5b783ed..12746f7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ maven-eclipse.xml .DS_Store jcr.log atlassian-ide-plugin.xml +dependency-reduced-pom.xml -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-testing-osgi-mock] branch master updated: ignore dependency-reduced-pom.xml
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git The following commit(s) were added to refs/heads/master by this push: new 3e42580 ignore dependency-reduced-pom.xml 3e42580 is described below commit 3e425805aa4b322744c2a8dfcbc49ee567124cee Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:54:12 2017 +0100 ignore dependency-reduced-pom.xml --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5b783ed..12746f7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ maven-eclipse.xml .DS_Store jcr.log atlassian-ide-plugin.xml +dependency-reduced-pom.xml -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-caconfig-bnd-plugin] branch master updated: add documentation link
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git The following commit(s) were added to refs/heads/master by this push: new 23efd6b add documentation link 23efd6b is described below commit 23efd6b0c2a3813303f6957e5828d74039119a70 Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:50:01 2017 +0100 add documentation link --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index abfdb4c..5a7a9c9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # Apache Sling Context-Aware Configuration bnd Plugin This module is part of the [Apache Sling](https://sling.apache.org) project. + +Documentation: [Apache Sling Context-Aware Configuration](https://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration.html) -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-caconfig-impl] branch master updated: add documentation link
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git The following commit(s) were added to refs/heads/master by this push: new 69e95a6 add documentation link 69e95a6 is described below commit 69e95a6f06733aa6b4e4349edfe9c4d90520003c Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:49:47 2017 +0100 add documentation link --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 68ad8f9..bef4e72 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # Apache Sling Context-Aware Configuration Implementation This module is part of the [Apache Sling](https://sling.apache.org) project. + +Documentation: [Apache Sling Context-Aware Configuration](https://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration.html) -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-caconfig-spi] branch master updated: add documentation link
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git The following commit(s) were added to refs/heads/master by this push: new 34eb52e add documentation link 34eb52e is described below commit 34eb52e812e00a0784e3e536de68074eca85ce65 Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:49:28 2017 +0100 add documentation link --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ef6a3de..8d7a28d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # Apache Sling Context-Aware Configuration SPI This module is part of the [Apache Sling](https://sling.apache.org) project. + +Documentation: [Apache Sling Context-Aware Configuration](https://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration.html) -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-caconfig-integration-tests] branch master updated: add documentation link
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-integration-tests.git The following commit(s) were added to refs/heads/master by this push: new db29ff9 add documentation link db29ff9 is described below commit db29ff933ebb5b84c0957e63df602b3ea1b1e70c Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:49:35 2017 +0100 add documentation link --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0941b26..ff1dd4e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # Apache Sling Context-Aware Configuration Integration Tests This module is part of the [Apache Sling](https://sling.apache.org) project. + +Documentation: [Apache Sling Context-Aware Configuration](https://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration.html) -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-caconfig-api] branch master updated: add documentation link
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git The following commit(s) were added to refs/heads/master by this push: new fd5c4b1 add documentation link fd5c4b1 is described below commit fd5c4b1c6b5f9f67da4e51fab39cf7337283fbff Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:48:46 2017 +0100 add documentation link --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index dc85cf8..8d1fde2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # Apache Sling Context-Aware Configuration API This module is part of the [Apache Sling](https://sling.apache.org) project. + +Documentation: [Apache Sling Context-Aware Configuration](https://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration.html) -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-caconfig-impl] branch master updated: ignore dependency-reduced-pom.xml
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git The following commit(s) were added to refs/heads/master by this push: new 15a5738 ignore dependency-reduced-pom.xml 15a5738 is described below commit 15a5738e3a272ae4fdfe29a1d3b924b9fb5ef2d6 Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Nov 6 16:47:14 2017 +0100 ignore dependency-reduced-pom.xml --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5b783ed..12746f7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ maven-eclipse.xml .DS_Store jcr.log atlassian-ide-plugin.xml +dependency-reduced-pom.xml -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
svn commit: r1812646 - in /sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig: impl/ management/ management/impl/
Author: sseifert
Date: Thu Oct 19 15:10:17 2017
New Revision: 1812646
URL: http://svn.apache.org/viewvc?rev=1812646=rev
Log:
SLING-7208 CAConfig Impl: Make ConfigurationResourceResolverConfig service
accessible from outside
Added:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java
- copied, changed from r1812645,
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java
Removed:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.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
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java?rev=1812646=1812645=1812646=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
Thu Oct 19 15:10:17 2017
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.ArrayUti
import org.apache.sling.api.resource.Resource;
import org.apache.sling.caconfig.ConfigurationBuilder;
import org.apache.sling.caconfig.ConfigurationResolver;
+import
org.apache.sling.caconfig.management.ConfigurationResourceResolverConfig;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationInheritanceStrategyMultiplexer;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationMetadataProviderMultiplexer;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
Copied:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java
(from r1812645,
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java?p2=sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java=sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java=1812645=1812646=1812646=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java
Thu Oct 19 15:10:17 2017
@@ -16,15 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.caconfig.impl;
+package org.apache.sling.caconfig.management;
import java.util.Collection;
import javax.annotation.Nonnull;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
- * Internal service for accessing the ConfigurationResourceResolver
configuration from other services.
+ * Service for accessing the ConfigurationResourceResolver configuration from
other services.
*/
+@ProviderType
public interface ConfigurationResourceResolverConfig {
/**
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java?rev=1812646=1812645=1812646=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
Thu Oct 19 15:10:17 2017
@@ -36,11 +36,11 @@ import org.apache.commons.collections.it
import org.apache.commons.lang3.StringUtils;
import
svn commit: r1812502 - in /sling/trunk/bundles/jcr/contentparser/src: main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java test/java/org/apache/sling/jcr/contentparser/impl/JsonContentP
Author: sseifert
Date: Wed Oct 18 12:24:39 2017
New Revision: 1812502
URL: http://svn.apache.org/viewvc?rev=1812502=rev
Log:
SLING-7185 Content Parser: Support for ISO-8601 (patch provided by Jason E
Bailey)
closes #261
Modified:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java
Modified:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java?rev=1812502=1812501=1812502=diff
==
---
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java
Wed Oct 18 12:24:39 2017
@@ -30,6 +30,7 @@ import java.util.Set;
import javax.json.JsonObject;
import org.apache.commons.lang3.StringUtils;
+import org.apache.jackrabbit.util.ISO8601;
import org.apache.sling.jcr.contentparser.ParseException;
import org.apache.sling.jcr.contentparser.ParserOptions;
@@ -67,16 +68,21 @@ class ParserHelper {
public Calendar tryParseCalendar(String value) {
if (options.isDetectCalendarValues() && !StringUtils.isBlank(value)) {
-synchronized (calendarFormat) {
-try {
+// 1st try: parse with ISO-8601 format first
+Calendar calendar = ISO8601.parse(value);
+if (calendar != null) {
+return calendar;
+}
+// 2nd try: parse with ECMA date format which is used by Sling GET
servlet
+calendar = Calendar.getInstance();
+try {
+synchronized (calendarFormat) {
Date date = calendarFormat.parse(value);
-Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
-return calendar;
-}
-catch (java.text.ParseException ex) {
-// ignore
}
+return calendar;
+} catch (java.text.ParseException ex) {
+// ignore
}
}
return null;
Modified:
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java?rev=1812502=1812501=1812502=diff
==
---
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java
Wed Oct 18 12:24:39 2017
@@ -107,6 +107,28 @@ public class JsonContentParserTest {
assertEquals(11, calendar.get(Calendar.MINUTE));
assertEquals(24, calendar.get(Calendar.SECOND));
}
+
+@Test
+public void testIso8601Calendar() throws Exception {
+ContentParser underTest = ContentParserFactory.create(ContentType.JSON,
+new ParserOptions().detectCalendarValues(true));
+ContentElement content = parse(underTest, file);
+
+Map<String, Object> props =
content.getChild("jcr:content").getProperties();
+
+Calendar calendar = (Calendar) props.get("dateISO8601String");
+assertNotNull(calendar);
+
+calendar.setTimeZone(TimeZone.getTimeZone("GMT+2"));
+
+assertEquals(2014, calendar.get(Calendar.YEAR));
+assertEquals(4, calendar.get(Calendar.MONTH) + 1);
+assertEquals(22, calendar.get(Calendar.DAY_OF_MONTH));
+
+assertEquals(15, calendar.get(Calendar.HOUR_OF_DAY));
+assertEquals(11, calendar.get(Calendar.MINUTE));
+assertEquals(24, calendar.get(Calendar.SECOND));
+}
@Test
public void testUTF8Chars() throws Exception {
[sling-site] branch master updated (2f2b448 -> 2e29a08)
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git. from 2f2b448 Merge pull request #3 from apache/fix-readme add 2e29a08 Apache Sling Maven Sling Plugin 2.3.4, Servlet Helpers 1.0.2, Servlet Helpers 1.1.2, JCR Mock 1.3.2, ResourceResolver Mock 1.1.20, OSGi Mock 1.9.8, OSGi Mock 2.3.4, Sling Mock 1.9.10, Sling Mock 2.2.14 No new revisions were added by this update. Summary of changes: src/main/jbake/content/releases.md | 1 + src/main/jbake/templates/downloads.tpl | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
svn commit: r1812423 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Tue Oct 17 15:36:01 2017 New Revision: 1812423 URL: http://svn.apache.org/viewvc?rev=1812423=rev Log: switch back to release versions 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=1812423=1812422=1812423=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Oct 17 15:36:01 2017 @@ -45,25 +45,25 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.3.5-SNAPSHOT +2.3.4 compile org.apache.sling org.apache.sling.testing.jcr-mock -1.3.3-SNAPSHOT +1.3.2 compile org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.1.21-SNAPSHOT +1.1.20 compile org.apache.sling org.apache.sling.servlet-helpers -1.1.3-SNAPSHOT +1.1.2 compile
svn commit: r1812418 - /sling/trunk/parent/pom.xml
Author: sseifert Date: Tue Oct 17 15:27:40 2017 New Revision: 1812418 URL: http://svn.apache.org/viewvc?rev=1812418=rev Log: update maven-sling-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=1812418=1812417=1812418=diff == --- sling/trunk/parent/pom.xml (original) +++ sling/trunk/parent/pom.xml Tue Oct 17 15:27:40 2017 @@ -284,7 +284,7 @@ org.apache.sling maven-sling-plugin -2.3.0 +2.3.4 org.apache.sling
svn commit: r22508 [2/2] - /release/sling/
Added: release/sling/org.apache.sling.testing.osgi-mock-2.3.4.pom == --- release/sling/org.apache.sling.testing.osgi-mock-2.3.4.pom (added) +++ release/sling/org.apache.sling.testing.osgi-mock-2.3.4.pom Tue Oct 17 12:52:28 2017 @@ -0,0 +1,209 @@ + +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;> + +sling +org.apache.sling +30 +pom.xml + + 4.0.0 + org.apache.sling.testing.osgi-mock + bundle + Apache Sling Testing OSGi Mock + 2.3.4 + Mock implementation of selected OSGi APIs. + + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4 + + + + +org.apache.felix +maven-bundle-plugin +true + + +org.apache.rat +apache-rat-plugin + + +src/test/resources/META-INF/test.txt +src/test/resources/bundleData/nested/first.txt +src/test/resources/bundleData/nested/second.txt +dependency-reduced-pom.xml + + + + +maven-shade-plugin +2.4.3 + + +package + + shade + + + true + true + + + org.apache.sling:org.apache.sling.commons.osgi + org.apache.felix:org.apache.felix.framework + org.apache.felix:org.apache.felix.scr + + + + + org.apache.sling.commons.osgi + osgimock.org.apache.sling.commons.osgi + + + org.apache.felix.framework + osgimock.org.apache.felix.framework + + + org.apache.felix.scr.impl + osgimock.org.apache.felix.scr.impl + + + + + org.apache.sling:org.apache.sling.commons.osgi + + org/apache/sling/commons/osgi/ServiceUtil* +org/apache/sling/commons/osgi/Order* + + + + org.apache.felix:org.apache.felix.framework + +org/apache/felix/framework/** + + + + org.apache.felix:org.apache.felix.scr + + org/apache/felix/scr/impl/inject/Annotations* + org/apache/felix/scr/impl/helper/Coercions* + + + + + + + + + + + + org.osgi + osgi.core + 6.0.0 + compile + + + org.osgi + osgi.cmpn + 6.0.0 + compile + + + com.google.guava + guava + 15.0 + compile + + + org.apache.commons + commons-lang3 + 3.0.1 + compile + + + commons-io + commons-io + 2.4 + compile + + + org.slf4j + slf4j-api + 1.7.6 + compile + + + org.reflections + reflections + 0.9.9 + compile + + + slf4j-api + org.slf4j + + + dom4j + dom4j + + + gson + com.google.code.gson + + + servlet-api + javax.servlet + + + slf4j-simple + org.slf4j + + + + + org.mockito + mockito-all + 1.9.5 + test + + + junit + junit + 4.12 + compile + + + org.apache.sling + org.apache.sling.testing.logging-mock + 2.0.0 + test + + + slf4j-simple + org.slf4j + + + + + org.osgi + osgi.annotation + 6.0.1 + provided + + + org.osgi + org.osgi.service.component.annotations + 1.3.0 + provided + + + org.osgi + org.osgi.service.metatype.annotations + 1.3.0 + provided + + + + Added: release/sling/org.apache.sling.testing.osgi-mock-2.3.4.pom.asc == --- release/sling/org.apache.sling.testing.osgi-mock-2.3.4.pom.asc (added) +++ release/sling/org.apache.sling.testing.osgi-mock-2.3.4.pom.asc Tue Oct 17 12:52:28 2017 @@ -0,0 +1,10 @@ +-BEGIN PGP
svn commit: r22508 [1/2] - /release/sling/
Author: sseifert Date: Tue Oct 17 12:52:28 2017 New Revision: 22508 Log: Apache Sling Servlet Helpers 1.0.2, Servlet Helpers 1.1.2, JCR Mock 1.3.2, ResourceResolver Mock 1.1.20, OSGi Mock 1.9.8, OSGi Mock 2.3.4, Sling Mock 1.9.10, Sling Mock 2.2.14 Added: release/sling/org.apache.sling.servlet-helpers-1.0.2-javadoc.jar (with props) release/sling/org.apache.sling.servlet-helpers-1.0.2-javadoc.jar.asc release/sling/org.apache.sling.servlet-helpers-1.0.2-javadoc.jar.md5 release/sling/org.apache.sling.servlet-helpers-1.0.2-javadoc.jar.sha1 release/sling/org.apache.sling.servlet-helpers-1.0.2-source-release.zip (with props) release/sling/org.apache.sling.servlet-helpers-1.0.2-source-release.zip.asc release/sling/org.apache.sling.servlet-helpers-1.0.2-source-release.zip.md5 release/sling/org.apache.sling.servlet-helpers-1.0.2-source-release.zip.sha1 release/sling/org.apache.sling.servlet-helpers-1.0.2-sources.jar (with props) release/sling/org.apache.sling.servlet-helpers-1.0.2-sources.jar.asc release/sling/org.apache.sling.servlet-helpers-1.0.2-sources.jar.md5 release/sling/org.apache.sling.servlet-helpers-1.0.2-sources.jar.sha1 release/sling/org.apache.sling.servlet-helpers-1.0.2.jar (with props) release/sling/org.apache.sling.servlet-helpers-1.0.2.jar.asc release/sling/org.apache.sling.servlet-helpers-1.0.2.jar.md5 release/sling/org.apache.sling.servlet-helpers-1.0.2.jar.sha1 release/sling/org.apache.sling.servlet-helpers-1.0.2.pom release/sling/org.apache.sling.servlet-helpers-1.0.2.pom.asc release/sling/org.apache.sling.servlet-helpers-1.0.2.pom.md5 release/sling/org.apache.sling.servlet-helpers-1.0.2.pom.sha1 release/sling/org.apache.sling.servlet-helpers-1.1.2-javadoc.jar (with props) release/sling/org.apache.sling.servlet-helpers-1.1.2-javadoc.jar.asc release/sling/org.apache.sling.servlet-helpers-1.1.2-javadoc.jar.md5 release/sling/org.apache.sling.servlet-helpers-1.1.2-javadoc.jar.sha1 release/sling/org.apache.sling.servlet-helpers-1.1.2-source-release.zip (with props) release/sling/org.apache.sling.servlet-helpers-1.1.2-source-release.zip.asc release/sling/org.apache.sling.servlet-helpers-1.1.2-source-release.zip.md5 release/sling/org.apache.sling.servlet-helpers-1.1.2-source-release.zip.sha1 release/sling/org.apache.sling.servlet-helpers-1.1.2-sources.jar (with props) release/sling/org.apache.sling.servlet-helpers-1.1.2-sources.jar.asc release/sling/org.apache.sling.servlet-helpers-1.1.2-sources.jar.md5 release/sling/org.apache.sling.servlet-helpers-1.1.2-sources.jar.sha1 release/sling/org.apache.sling.servlet-helpers-1.1.2.jar (with props) release/sling/org.apache.sling.servlet-helpers-1.1.2.jar.asc release/sling/org.apache.sling.servlet-helpers-1.1.2.jar.md5 release/sling/org.apache.sling.servlet-helpers-1.1.2.jar.sha1 release/sling/org.apache.sling.servlet-helpers-1.1.2.pom release/sling/org.apache.sling.servlet-helpers-1.1.2.pom.asc release/sling/org.apache.sling.servlet-helpers-1.1.2.pom.md5 release/sling/org.apache.sling.servlet-helpers-1.1.2.pom.sha1 release/sling/org.apache.sling.testing.jcr-mock-1.3.2-javadoc.jar (with props) release/sling/org.apache.sling.testing.jcr-mock-1.3.2-javadoc.jar.asc release/sling/org.apache.sling.testing.jcr-mock-1.3.2-javadoc.jar.md5 release/sling/org.apache.sling.testing.jcr-mock-1.3.2-javadoc.jar.sha1 release/sling/org.apache.sling.testing.jcr-mock-1.3.2-source-release.zip (with props) release/sling/org.apache.sling.testing.jcr-mock-1.3.2-source-release.zip.asc release/sling/org.apache.sling.testing.jcr-mock-1.3.2-source-release.zip.md5 release/sling/org.apache.sling.testing.jcr-mock-1.3.2-source-release.zip.sha1 release/sling/org.apache.sling.testing.jcr-mock-1.3.2-sources.jar (with props) release/sling/org.apache.sling.testing.jcr-mock-1.3.2-sources.jar.asc release/sling/org.apache.sling.testing.jcr-mock-1.3.2-sources.jar.md5 release/sling/org.apache.sling.testing.jcr-mock-1.3.2-sources.jar.sha1 release/sling/org.apache.sling.testing.jcr-mock-1.3.2.jar (with props) release/sling/org.apache.sling.testing.jcr-mock-1.3.2.jar.asc release/sling/org.apache.sling.testing.jcr-mock-1.3.2.jar.md5 release/sling/org.apache.sling.testing.jcr-mock-1.3.2.jar.sha1 release/sling/org.apache.sling.testing.jcr-mock-1.3.2.pom release/sling/org.apache.sling.testing.jcr-mock-1.3.2.pom.asc release/sling/org.apache.sling.testing.jcr-mock-1.3.2.pom.md5 release/sling/org.apache.sling.testing.jcr-mock-1.3.2.pom.sha1 release/sling/org.apache.sling.testing.osgi-mock-1.9.8-javadoc.jar (with props) release/sling/org.apache.sling.testing.osgi-mock-1.9.8-javadoc.jar.asc release/sling/org.apache.sling.testing.osgi-mock-1.9.8-javadoc.jar.md5 release/sling/org.apache.sling.testing.osgi-mock-1.9.8
svn commit: r22507 - /release/sling/
Author: sseifert Date: Tue Oct 17 12:44:45 2017 New Revision: 22507 Log: Apache Sling Maven Sling Plugin 2.3.4 Added: release/sling/maven-sling-plugin-2.3.4-javadoc.jar (with props) release/sling/maven-sling-plugin-2.3.4-javadoc.jar.asc release/sling/maven-sling-plugin-2.3.4-javadoc.jar.md5 release/sling/maven-sling-plugin-2.3.4-javadoc.jar.sha1 release/sling/maven-sling-plugin-2.3.4-source-release.zip (with props) release/sling/maven-sling-plugin-2.3.4-source-release.zip.asc release/sling/maven-sling-plugin-2.3.4-source-release.zip.md5 release/sling/maven-sling-plugin-2.3.4-source-release.zip.sha1 release/sling/maven-sling-plugin-2.3.4-sources.jar (with props) release/sling/maven-sling-plugin-2.3.4-sources.jar.asc release/sling/maven-sling-plugin-2.3.4-sources.jar.md5 release/sling/maven-sling-plugin-2.3.4-sources.jar.sha1 release/sling/maven-sling-plugin-2.3.4.jar (with props) release/sling/maven-sling-plugin-2.3.4.jar.asc release/sling/maven-sling-plugin-2.3.4.jar.md5 release/sling/maven-sling-plugin-2.3.4.jar.sha1 release/sling/maven-sling-plugin-2.3.4.pom release/sling/maven-sling-plugin-2.3.4.pom.asc release/sling/maven-sling-plugin-2.3.4.pom.md5 release/sling/maven-sling-plugin-2.3.4.pom.sha1 Removed: release/sling/maven-sling-plugin-2.3.2-javadoc.jar release/sling/maven-sling-plugin-2.3.2-javadoc.jar.asc release/sling/maven-sling-plugin-2.3.2-javadoc.jar.md5 release/sling/maven-sling-plugin-2.3.2-javadoc.jar.sha1 release/sling/maven-sling-plugin-2.3.2-source-release.zip release/sling/maven-sling-plugin-2.3.2-source-release.zip.asc release/sling/maven-sling-plugin-2.3.2-source-release.zip.md5 release/sling/maven-sling-plugin-2.3.2-source-release.zip.sha1 release/sling/maven-sling-plugin-2.3.2-sources.jar release/sling/maven-sling-plugin-2.3.2-sources.jar.asc release/sling/maven-sling-plugin-2.3.2-sources.jar.md5 release/sling/maven-sling-plugin-2.3.2-sources.jar.sha1 release/sling/maven-sling-plugin-2.3.2.jar release/sling/maven-sling-plugin-2.3.2.jar.asc release/sling/maven-sling-plugin-2.3.2.jar.md5 release/sling/maven-sling-plugin-2.3.2.jar.sha1 release/sling/maven-sling-plugin-2.3.2.pom release/sling/maven-sling-plugin-2.3.2.pom.asc release/sling/maven-sling-plugin-2.3.2.pom.md5 release/sling/maven-sling-plugin-2.3.2.pom.sha1 Added: release/sling/maven-sling-plugin-2.3.4-javadoc.jar == Binary file - no diff available. Propchange: release/sling/maven-sling-plugin-2.3.4-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/maven-sling-plugin-2.3.4-javadoc.jar.asc == --- release/sling/maven-sling-plugin-2.3.4-javadoc.jar.asc (added) +++ release/sling/maven-sling-plugin-2.3.4-javadoc.jar.asc Tue Oct 17 12:44:45 2017 @@ -0,0 +1,10 @@ +-BEGIN PGP SIGNATURE- + +iQEcBAABAgAGBQJZ3m7kAAoJEM4rf/Z1146S8WwH/jMvxu8Kzp3RdoWpj0YGj4Q5 +5AY4XcfY4vtyS75yDWBchxqd1iE+QS9nwEUtrckUbTUs+a4A9WXWU7lHH0UNY19Q +Jv1kiaV8xgw/kL7U/JkioVC+bxaW4R44zfetZSzfwJX/BSCRG3rW3sgCWY++Odj9 +eVtupkFq/99h6S3Q1/6xsWj7vT/cLzuR1pjWUJiWj75dzzkO7NZmcNyVjNm14WG5 +1KQRGSPgUrGDYSi5xKMbCHuNzzv54Zk0UScZ3iEwlxLc2saRMAN3uy6NjRYhaRog +0J081urbYVThDZykGu6QsknTWlzUw1zRMbio4Asv0JMj9Jl02VC0tKgLzWZxqJE= +=cnlB +-END PGP SIGNATURE- Added: release/sling/maven-sling-plugin-2.3.4-javadoc.jar.md5 == --- release/sling/maven-sling-plugin-2.3.4-javadoc.jar.md5 (added) +++ release/sling/maven-sling-plugin-2.3.4-javadoc.jar.md5 Tue Oct 17 12:44:45 2017 @@ -0,0 +1 @@ +5c6111f22f11f3349434fe7e1a94f199 \ No newline at end of file Added: release/sling/maven-sling-plugin-2.3.4-javadoc.jar.sha1 == --- release/sling/maven-sling-plugin-2.3.4-javadoc.jar.sha1 (added) +++ release/sling/maven-sling-plugin-2.3.4-javadoc.jar.sha1 Tue Oct 17 12:44:45 2017 @@ -0,0 +1 @@ +234a88f9a3820e19b85a5926187d348331d0e345 \ No newline at end of file Added: release/sling/maven-sling-plugin-2.3.4-source-release.zip == Binary file - no diff available. Propchange: release/sling/maven-sling-plugin-2.3.4-source-release.zip -- svn:mime-type = application/octet-stream Propchange: release/sling/maven-sling-plugin-2.3.4-source-release.zip -- svn:needs-lock = * Added: release/sling/maven-sling-plugin-2.3.4-source-release.zip.asc
svn commit: r1812048 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:23:19 2017 New Revision: 1812048 URL: http://svn.apache.org/viewvc?rev=1812048=rev Log: update to next snapshot versions until release versions are available on maven central 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=1812048=1812047=1812048=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu Oct 12 20:23:19 2017 @@ -45,25 +45,25 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.3.4 +2.3.5-SNAPSHOT compile org.apache.sling org.apache.sling.testing.jcr-mock -1.3.2 +1.3.3-SNAPSHOT compile org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.1.20 +1.1.21-SNAPSHOT compile org.apache.sling org.apache.sling.servlet-helpers -1.1.2 +1.1.3-SNAPSHOT compile
svn commit: r1812047 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:21:17 2017 New Revision: 1812047 URL: http://svn.apache.org/viewvc?rev=1812047=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=1812047=1812046=1812047=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu Oct 12 20:21:17 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.sling-mock -2.2.14 +2.2.15-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.14 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-2.2.14 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-2.2.14 + 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: r1812045 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:21:02 2017 New Revision: 1812045 URL: http://svn.apache.org/viewvc?rev=1812045=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-2.2.14 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=1812045=1812044=1812045=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu Oct 12 20:21:02 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.sling-mock -2.2.13-SNAPSHOT +2.2.14 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.14 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-2.2.14 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-2.2.14
svn commit: r1812046 - /sling/tags/org.apache.sling.testing.sling-mock-2.2.14/
Author: sseifert Date: Thu Oct 12 20:21:15 2017 New Revision: 1812046 URL: http://svn.apache.org/viewvc?rev=1812046=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-2.2.14 Added: sling/tags/org.apache.sling.testing.sling-mock-2.2.14/ - copied from r1812045, sling/trunk/testing/mocks/sling-mock/
svn commit: r1812044 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:20:35 2017 New Revision: 1812044 URL: http://svn.apache.org/viewvc?rev=1812044=rev Log: update dependencies 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=1812044=1812043=1812044=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu Oct 12 20:20:35 2017 @@ -45,25 +45,25 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.3.3-SNAPSHOT +2.3.4 compile org.apache.sling org.apache.sling.testing.jcr-mock -1.3.1-SNAPSHOT +1.3.2 compile org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.1.19-SNAPSHOT +1.1.20 compile org.apache.sling org.apache.sling.servlet-helpers -1.1.1-SNAPSHOT +1.1.2 compile
svn commit: r1812043 - /sling/branches/testing/mocks/sling-mock-1.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:18:49 2017 New Revision: 1812043 URL: http://svn.apache.org/viewvc?rev=1812043=rev Log: update to next snapshot versions until release versions are available on maven central 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=1812043=1812042=1812043=diff == --- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Thu Oct 12 20:18:49 2017 @@ -45,25 +45,25 @@ org.apache.sling org.apache.sling.testing.osgi-mock -1.9.8 +1.9.9-SNAPSHOT compile org.apache.sling org.apache.sling.testing.jcr-mock -1.3.2 +1.3.3-SNAPSHOT compile org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.1.20 +1.1.21-SNAPSHOT compile org.apache.sling org.apache.sling.servlet-helpers -1.0.2 +1.0.3-SNAPSHOT compile
svn commit: r1812039 - /sling/tags/org.apache.sling.testing.sling-mock-1.9.10/
Author: sseifert Date: Thu Oct 12 20:15:19 2017 New Revision: 1812039 URL: http://svn.apache.org/viewvc?rev=1812039=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-1.9.10 Added: sling/tags/org.apache.sling.testing.sling-mock-1.9.10/ - copied from r1812038, sling/branches/testing/mocks/sling-mock-1.x/
svn commit: r1812038 - /sling/branches/testing/mocks/sling-mock-1.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:15:06 2017 New Revision: 1812038 URL: http://svn.apache.org/viewvc?rev=1812038=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.9.10 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=1812038=1812037=1812038=diff == --- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Thu Oct 12 20:15:06 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.sling-mock -1.9.9-SNAPSHOT +1.9.10 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.10 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.9.10 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-1.9.10
svn commit: r1812037 - /sling/branches/testing/mocks/sling-mock-1.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:14:36 2017 New Revision: 1812037 URL: http://svn.apache.org/viewvc?rev=1812037=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=1812037=1812036=1812037=diff == --- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Thu Oct 12 20:14:36 2017 @@ -45,25 +45,25 @@ org.apache.sling org.apache.sling.testing.osgi-mock -1.9.7-SNAPSHOT +1.9.8 compile org.apache.sling org.apache.sling.testing.jcr-mock -1.3.1-SNAPSHOT +1.3.2 compile org.apache.sling org.apache.sling.testing.resourceresolver-mock -1.1.19-SNAPSHOT +1.1.20 compile org.apache.sling org.apache.sling.servlet-helpers -1.0.1-SNAPSHOT +1.0.2 compile
svn commit: r1812035 - /sling/tags/org.apache.sling.testing.osgi-mock-2.3.4/
Author: sseifert Date: Thu Oct 12 20:12:31 2017 New Revision: 1812035 URL: http://svn.apache.org/viewvc?rev=1812035=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.osgi-mock-2.3.4 Added: sling/tags/org.apache.sling.testing.osgi-mock-2.3.4/ - copied from r1812034, sling/trunk/testing/mocks/osgi-mock/
svn commit: r1812036 - /sling/trunk/testing/mocks/osgi-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:12:33 2017 New Revision: 1812036 URL: http://svn.apache.org/viewvc?rev=1812036=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1812036=1812035=1812036=diff == --- sling/trunk/testing/mocks/osgi-mock/pom.xml (original) +++ sling/trunk/testing/mocks/osgi-mock/pom.xml Thu Oct 12 20:12:33 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.osgi-mock -2.3.4 +2.3.5-SNAPSHOT bundle Apache Sling Testing OSGi Mock Mock implementation of selected OSGi APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock + http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock
svn commit: r1812034 - /sling/trunk/testing/mocks/osgi-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:12:18 2017 New Revision: 1812034 URL: http://svn.apache.org/viewvc?rev=1812034=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock-2.3.4 Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1812034=1812033=1812034=diff == --- sling/trunk/testing/mocks/osgi-mock/pom.xml (original) +++ sling/trunk/testing/mocks/osgi-mock/pom.xml Thu Oct 12 20:12:18 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.osgi-mock -2.3.3-SNAPSHOT +2.3.4 bundle Apache Sling Testing OSGi Mock Mock implementation of selected OSGi APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock - http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-2.3.4
svn commit: r1812031 - /sling/tags/org.apache.sling.testing.osgi-mock-1.9.8/
Author: sseifert Date: Thu Oct 12 20:11:00 2017 New Revision: 1812031 URL: http://svn.apache.org/viewvc?rev=1812031=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.osgi-mock-1.9.8 Added: sling/tags/org.apache.sling.testing.osgi-mock-1.9.8/ (props changed) - copied from r1812030, sling/branches/testing/mocks/osgi-mock-1.x/ Propchange: sling/tags/org.apache.sling.testing.osgi-mock-1.9.8/ -- --- svn:ignore (added) +++ svn:ignore Thu Oct 12 20:11:00 2017 @@ -0,0 +1,18 @@ +target +sling +bin +logs +jackrabbit +oak +derby.log +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml +oak-server-default-NodeStore + + Propchange: sling/tags/org.apache.sling.testing.osgi-mock-1.9.8/ -- svn:mergeinfo = /sling/trunk/testing/mocks/osgi-mock:1731758
svn commit: r1812032 - /sling/branches/testing/mocks/osgi-mock-1.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:11:02 2017 New Revision: 1812032 URL: http://svn.apache.org/viewvc?rev=1812032=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/branches/testing/mocks/osgi-mock-1.x/pom.xml Modified: sling/branches/testing/mocks/osgi-mock-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x/pom.xml?rev=1812032=1812031=1812032=diff == --- sling/branches/testing/mocks/osgi-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/osgi-mock-1.x/pom.xml Thu Oct 12 20:11:02 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.osgi-mock -1.9.8 +1.9.9-SNAPSHOT bundle Apache Sling Testing OSGi Mock Mock implementation of selected OSGi APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.9.8 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.9.8 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-1.9.8 + scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/osgi-mock-1.x + scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/osgi-mock-1.x + http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x
svn commit: r1812030 - /sling/branches/testing/mocks/osgi-mock-1.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:10:47 2017 New Revision: 1812030 URL: http://svn.apache.org/viewvc?rev=1812030=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock-1.9.8 Modified: sling/branches/testing/mocks/osgi-mock-1.x/pom.xml Modified: sling/branches/testing/mocks/osgi-mock-1.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x/pom.xml?rev=1812030=1812029=1812030=diff == --- sling/branches/testing/mocks/osgi-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/osgi-mock-1.x/pom.xml Thu Oct 12 20:10:47 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.osgi-mock -1.9.7-SNAPSHOT +1.9.8 bundle Apache Sling Testing OSGi Mock Mock implementation of selected OSGi APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/osgi-mock-1.x - scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/osgi-mock-1.x - http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.9.8 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.9.8 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-1.9.8
svn commit: r1812029 - /sling/trunk/testing/mocks/resourceresolver-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:09:28 2017 New Revision: 1812029 URL: http://svn.apache.org/viewvc?rev=1812029=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=1812029=1812028=1812029=diff == --- sling/trunk/testing/mocks/resourceresolver-mock/pom.xml (original) +++ sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Thu Oct 12 20:09:28 2017 @@ -28,7 +28,7 @@ org.apache.sling.testing.resourceresolver-mock -1.1.20 +1.1.21-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.20 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.20 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.20 + 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: r1812026 - /sling/trunk/testing/mocks/resourceresolver-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:09:12 2017 New Revision: 1812026 URL: http://svn.apache.org/viewvc?rev=1812026=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.1.20 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=1812026=1812025=1812026=diff == --- sling/trunk/testing/mocks/resourceresolver-mock/pom.xml (original) +++ sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Thu Oct 12 20:09:12 2017 @@ -28,7 +28,7 @@ org.apache.sling.testing.resourceresolver-mock -1.1.19-SNAPSHOT +1.1.20 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.20 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.20 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.20
svn commit: r1812028 - /sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.20/
Author: sseifert Date: Thu Oct 12 20:09:25 2017 New Revision: 1812028 URL: http://svn.apache.org/viewvc?rev=1812028=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.resourceresolver-mock-1.1.20 Added: sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.20/ - copied from r1812026, sling/trunk/testing/mocks/resourceresolver-mock/
svn commit: r1812023 - /sling/trunk/testing/mocks/jcr-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:07:55 2017 New Revision: 1812023 URL: http://svn.apache.org/viewvc?rev=1812023=rev Log: [maven-release-plugin] prepare release org.apache.sling.testing.jcr-mock-1.3.2 Modified: sling/trunk/testing/mocks/jcr-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=1812023=1812022=1812023=diff == --- sling/trunk/testing/mocks/jcr-mock/pom.xml (original) +++ sling/trunk/testing/mocks/jcr-mock/pom.xml Thu Oct 12 20:07:55 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.jcr-mock -1.3.1-SNAPSHOT +1.3.2 bundle Apache Sling Testing JCR Mock Mock implementation of selected JCR APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock - http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.jcr-mock-1.3.2 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.jcr-mock-1.3.2 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.jcr-mock-1.3.2
svn commit: r1812024 - /sling/tags/org.apache.sling.testing.jcr-mock-1.3.2/
Author: sseifert Date: Thu Oct 12 20:08:08 2017 New Revision: 1812024 URL: http://svn.apache.org/viewvc?rev=1812024=rev Log: [maven-release-plugin] copy for tag org.apache.sling.testing.jcr-mock-1.3.2 Added: sling/tags/org.apache.sling.testing.jcr-mock-1.3.2/ - copied from r1812023, sling/trunk/testing/mocks/jcr-mock/
svn commit: r1812025 - /sling/trunk/testing/mocks/jcr-mock/pom.xml
Author: sseifert Date: Thu Oct 12 20:08:10 2017 New Revision: 1812025 URL: http://svn.apache.org/viewvc?rev=1812025=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/testing/mocks/jcr-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=1812025=1812024=1812025=diff == --- sling/trunk/testing/mocks/jcr-mock/pom.xml (original) +++ sling/trunk/testing/mocks/jcr-mock/pom.xml Thu Oct 12 20:08:10 2017 @@ -28,16 +28,16 @@ org.apache.sling.testing.jcr-mock -1.3.2 +1.3.3-SNAPSHOT bundle Apache Sling Testing JCR Mock Mock implementation of selected JCR APIs. - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.jcr-mock-1.3.2 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.jcr-mock-1.3.2 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.jcr-mock-1.3.2 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock + http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock
svn commit: r1812021 - /sling/tags/org.apache.sling.servlet-helpers-1.0.2/
Author: sseifert Date: Thu Oct 12 20:05:16 2017 New Revision: 1812021 URL: http://svn.apache.org/viewvc?rev=1812021=rev Log: [maven-release-plugin] copy for tag org.apache.sling.servlet-helpers-1.0.2 Added: sling/tags/org.apache.sling.servlet-helpers-1.0.2/ - copied from r1812020, sling/branches/testing/mocks/servlet-helpers-1.0.x/
svn commit: r1812022 - /sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:05:18 2017 New Revision: 1812022 URL: http://svn.apache.org/viewvc?rev=1812022=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml?rev=1812022=1812021=1812022=diff == --- sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml (original) +++ sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Thu Oct 12 20:05:18 2017 @@ -29,20 +29,20 @@ org.apache.sling.servlet-helpers bundle -1.0.2 +1.0.3-SNAPSHOT Apache Sling Servlet Helpers Mock implementations of SlingHttpServletRequest, SlingHttpServletResponse and related classes. - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.0.2 + scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/servlet-helpers-1.0.x - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.0.2 + scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/servlet-helpers-1.0.x - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.servlet-helpers-1.0.2 + http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x
svn commit: r1812019 - /sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:04:38 2017 New Revision: 1812019 URL: http://svn.apache.org/viewvc?rev=1812019=rev Log: fix scm url Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml?rev=1812019=1812018=1812019=diff == --- sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml (original) +++ sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Thu Oct 12 20:04:38 2017 @@ -36,13 +36,13 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers + scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/servlet-helpers-1.0.x - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers + scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/servlet-helpers-1.0.x - http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers + http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x
svn commit: r1812020 - /sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:05:03 2017 New Revision: 1812020 URL: http://svn.apache.org/viewvc?rev=1812020=rev Log: [maven-release-plugin] prepare release org.apache.sling.servlet-helpers-1.0.2 Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml?rev=1812020=1812019=1812020=diff == --- sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml (original) +++ sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Thu Oct 12 20:05:03 2017 @@ -29,20 +29,20 @@ org.apache.sling.servlet-helpers bundle -1.0.1-SNAPSHOT +1.0.2 Apache Sling Servlet Helpers Mock implementations of SlingHttpServletRequest, SlingHttpServletResponse and related classes. - scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/servlet-helpers-1.0.x + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.0.2 - scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/servlet-helpers-1.0.x + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.0.2 - http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.servlet-helpers-1.0.2
svn commit: r1812018 - /sling/tags/org.apache.sling.servlet-helpers-1.0.2/
Author: sseifert Date: Thu Oct 12 20:03:06 2017 New Revision: 1812018 URL: http://svn.apache.org/viewvc?rev=1812018=rev Log: rollback release Removed: sling/tags/org.apache.sling.servlet-helpers-1.0.2/
svn commit: r1812017 - /sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml
Author: sseifert Date: Thu Oct 12 20:02:35 2017 New Revision: 1812017 URL: http://svn.apache.org/viewvc?rev=1812017=rev Log: rollback release Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml?rev=1812017=1812016=1812017=diff == --- sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml (original) +++ sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Thu Oct 12 20:02:35 2017 @@ -29,7 +29,7 @@ org.apache.sling.servlet-helpers bundle -1.0.3-SNAPSHOT +1.0.1-SNAPSHOT Apache Sling Servlet Helpers Mock implementations of SlingHttpServletRequest, SlingHttpServletResponse and related classes.
svn commit: r1812015 - /sling/trunk/bundles/extensions/servlet-helpers/pom.xml
Author: sseifert Date: Thu Oct 12 19:59:28 2017 New Revision: 1812015 URL: http://svn.apache.org/viewvc?rev=1812015=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/servlet-helpers/pom.xml Modified: sling/trunk/bundles/extensions/servlet-helpers/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/pom.xml?rev=1812015=1812014=1812015=diff == --- sling/trunk/bundles/extensions/servlet-helpers/pom.xml (original) +++ sling/trunk/bundles/extensions/servlet-helpers/pom.xml Thu Oct 12 19:59:28 2017 @@ -29,20 +29,20 @@ org.apache.sling.servlet-helpers bundle -1.1.2 +1.1.3-SNAPSHOT Apache Sling Servlet Helpers Mock implementations of SlingHttpServletRequest, SlingHttpServletResponse and related classes. - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.1.2 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.1.2 + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.servlet-helpers-1.1.2 + http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers
svn commit: r1812014 - /sling/tags/org.apache.sling.servlet-helpers-1.1.2/
Author: sseifert Date: Thu Oct 12 19:59:26 2017 New Revision: 1812014 URL: http://svn.apache.org/viewvc?rev=1812014=rev Log: [maven-release-plugin] copy for tag org.apache.sling.servlet-helpers-1.1.2 Added: sling/tags/org.apache.sling.servlet-helpers-1.1.2/ - copied from r1812013, sling/trunk/bundles/extensions/servlet-helpers/
svn commit: r1812013 - /sling/trunk/bundles/extensions/servlet-helpers/pom.xml
Author: sseifert Date: Thu Oct 12 19:59:13 2017 New Revision: 1812013 URL: http://svn.apache.org/viewvc?rev=1812013=rev Log: [maven-release-plugin] prepare release org.apache.sling.servlet-helpers-1.1.2 Modified: sling/trunk/bundles/extensions/servlet-helpers/pom.xml Modified: sling/trunk/bundles/extensions/servlet-helpers/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/pom.xml?rev=1812013=1812012=1812013=diff == --- sling/trunk/bundles/extensions/servlet-helpers/pom.xml (original) +++ sling/trunk/bundles/extensions/servlet-helpers/pom.xml Thu Oct 12 19:59:13 2017 @@ -29,20 +29,20 @@ org.apache.sling.servlet-helpers bundle -1.1.1-SNAPSHOT +1.1.2 Apache Sling Servlet Helpers Mock implementations of SlingHttpServletRequest, SlingHttpServletResponse and related classes. - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.1.2 - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.1.2 - http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.servlet-helpers-1.1.2
svn commit: r1812012 - /sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml
Author: sseifert Date: Thu Oct 12 19:58:32 2017 New Revision: 1812012 URL: http://svn.apache.org/viewvc?rev=1812012=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml?rev=1812012=1812011=1812012=diff == --- sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml (original) +++ sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Thu Oct 12 19:58:32 2017 @@ -29,20 +29,20 @@ org.apache.sling.servlet-helpers bundle -1.0.2 +1.0.3-SNAPSHOT Apache Sling Servlet Helpers Mock implementations of SlingHttpServletRequest, SlingHttpServletResponse and related classes. - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.0.2 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.0.2 + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.servlet-helpers-1.0.2 + http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers
svn commit: r1812011 - /sling/tags/org.apache.sling.servlet-helpers-1.0.2/
Author: sseifert Date: Thu Oct 12 19:58:30 2017 New Revision: 1812011 URL: http://svn.apache.org/viewvc?rev=1812011=rev Log: [maven-release-plugin] copy for tag org.apache.sling.servlet-helpers-1.0.2 Added: sling/tags/org.apache.sling.servlet-helpers-1.0.2/ - copied from r1812010, sling/trunk/bundles/extensions/servlet-helpers/
svn commit: r1812010 - /sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml
Author: sseifert Date: Thu Oct 12 19:58:17 2017 New Revision: 1812010 URL: http://svn.apache.org/viewvc?rev=1812010=rev Log: [maven-release-plugin] prepare release org.apache.sling.servlet-helpers-1.0.2 Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml?rev=1812010=1812009=1812010=diff == --- sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml (original) +++ sling/branches/testing/mocks/servlet-helpers-1.0.x/pom.xml Thu Oct 12 19:58:17 2017 @@ -29,20 +29,20 @@ org.apache.sling.servlet-helpers bundle -1.0.1-SNAPSHOT +1.0.2 Apache Sling Servlet Helpers Mock implementations of SlingHttpServletRequest, SlingHttpServletResponse and related classes. - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.0.2 - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlet-helpers-1.0.2 - http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.servlet-helpers-1.0.2
svn commit: r1811989 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Thu Oct 12 16:00:09 2017 New Revision: 1811989 URL: http://svn.apache.org/viewvc?rev=1811989=rev Log: update jcr-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=1811989=1811988=1811989=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu Oct 12 16:00:09 2017 @@ -51,7 +51,7 @@ org.apache.sling org.apache.sling.testing.jcr-mock -1.3.0 +1.3.1-SNAPSHOT compile
svn commit: r1811988 - in /sling/trunk/testing/mocks/sling-mock: pom.xml src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
Author: sseifert Date: Thu Oct 12 15:56:25 2017 New Revision: 1811988 URL: http://svn.apache.org/viewvc?rev=1811988=rev Log: SLING-7196 sling-mock: Make sure SlingContext.registerAdapter can overlay built-in adaptions Modified: sling/trunk/testing/mocks/sling-mock/pom.xml 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/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1811988=1811987=1811988=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu Oct 12 15:56:25 2017 @@ -45,7 +45,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -2.3.2 +2.3.3-SNAPSHOT compile 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=1811988=1811987=1811988=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 Thu Oct 12 15:56:25 2017 @@ -479,7 +479,8 @@ public class SlingContextImpl extends Os adapterClass.getName() }) // make sure this overlay has higher ranking than other adapter factories -.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE) +// normally we should use Integer.MAX_VALUE for this - but due to SLING-7194 prefers lowest-ranking services first +.put(Constants.SERVICE_RANKING, Integer.MIN_VALUE) .build()); }
svn commit: r1811984 - /sling/branches/testing/mocks/sling-mock-1.x/pom.xml
Author: sseifert Date: Thu Oct 12 15:43:40 2017 New Revision: 1811984 URL: http://svn.apache.org/viewvc?rev=1811984=rev Log: update osgi-mock 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=1811984=1811983=1811984=diff == --- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original) +++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Thu Oct 12 15:43:40 2017 @@ -45,7 +45,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock -1.9.6 +1.9.7-SNAPSHOT compile
svn commit: r1811983 - in /sling/branches/testing/mocks/osgi-mock-1.x/src: main/java/org/apache/sling/testing/mock/osgi/ test/java/org/apache/sling/testing/mock/osgi/ test/java/org/apache/sling/testin
Author: sseifert
Date: Thu Oct 12 15:42:07 2017
New Revision: 1811983
URL: http://svn.apache.org/viewvc?rev=1811983=rev
Log:
SLING-7193 MockServiceReference.compareTo needs to implement lowest-first
ranking - but BundleContext.getService() should return service with highest
ranking
Modified:
sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java
Modified:
sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
URL:
http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java?rev=1811983=1811982=1811983=diff
==
---
sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
(original)
+++
sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
Thu Oct 12 15:42:07 2017
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Dictionary;
import java.util.List;
import java.util.Map;
@@ -262,7 +263,13 @@ class MockBundleContext implements Bundl
@Override
public ServiceReference[] getServiceReferences(final String clazz, final
String filter) throws InvalidSyntaxException {
-Set result = new TreeSet();
+Set result = new TreeSet(new
Comparator() {
+@Override
+public int compare(ServiceReference o1, ServiceReference o2) {
+// reverse sort order to get highest ranking first
+return o2.compareTo(o1);
+}
+});
for (MockServiceRegistration serviceRegistration :
this.registeredServices) {
if (serviceRegistration.matches(clazz, filter)) {
result.add(serviceRegistration.getReference());
Modified:
sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
URL:
http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java?rev=1811983=1811982=1811983=diff
==
---
sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
(original)
+++
sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
Thu Oct 12 15:42:07 2017
@@ -72,19 +72,19 @@ public class MockBundleContextTest {
@Test
public void testServiceRegistration() throws InvalidSyntaxException {
// prepare test services
-String[] clazzes2 = new String[] { String.class.getName(),
Integer.class.getName() };
-Object service2 = new Object();
-Dictionary properties2 = getServiceProperties(null);
-ServiceRegistration reg2 = bundleContext.registerService(clazzes2,
service2, properties2);
-
-String clazz1 = String.class.getName();
+String[] clazzes1 = new String[] { String.class.getName(),
Integer.class.getName() };
Object service1 = new Object();
-Dictionary properties1 = getServiceProperties(null);
-ServiceRegistration reg1 = bundleContext.registerService(clazz1,
service1, properties1);
+Dictionary<String, Object> properties2 = ranking(null);
+ServiceRegistration reg1 = bundleContext.registerService(clazzes1,
service1, properties2);
+
+String clazz2 = String.class.getName();
+Object service2 = new Object();
+Dictionary<String, Object> properties1 = ranking(null);
+ServiceRegistration reg2 = bundleContext.registerService(clazz2,
service2, properties1);
String clazz3 = Integer.class.getName();
Object service3 = new Object();
-Dictionary properties3 = getServiceProperties(-100L);
+Dictionary<String, Object> properties3 = ranking(-100);
ServiceRegistration reg3 = bundleContext.registerService(clazz3,
service3, properties3);
// test get service references
@@ -92,17 +92,21 @@ public class MockBundleContextTest {
assertSame(reg1.getReference(), refString);
ServiceReference refInteger =
bundleContext.getServiceReference(Integer.class.getName());
-assertSame(reg3.getReference(), refInteger);
+assertSame(reg1.getReference(), refInteger);
ServiceRefe
svn commit: r1811972 - 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: Thu Oct 12 14:49:29 2017
New Revision: 1811972
URL: http://svn.apache.org/viewvc?rev=1811972=rev
Log:
SLING-7193 MockServiceReference.compareTo needs to implement lowest-first
ranking
Modified:
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/MockServiceReference.java
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
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=1811972=1811971=1811972=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
Thu Oct 12 14:49:29 2017
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Dictionary;
import java.util.List;
import java.util.Map;
@@ -283,7 +284,13 @@ class MockBundleContext implements Bundl
@SuppressWarnings("unchecked")
@Override
public ServiceReference[] getServiceReferences(final String clazz, final
String filter) throws InvalidSyntaxException {
-Set result = new TreeSet();
+Set result = new TreeSet(new
Comparator() {
+@Override
+public int compare(ServiceReference o1, ServiceReference o2) {
+// reverse sort order to get highest ranking first
+return o2.compareTo(o1);
+}
+});
for (MockServiceRegistration serviceRegistration :
this.registeredServices) {
if (serviceRegistration.matches(clazz, filter)) {
result.add(serviceRegistration.getReference());
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java?rev=1811972=1811971=1811972=diff
==
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
Thu Oct 12 14:49:29 2017
@@ -45,7 +45,8 @@ class MockServiceReference implements
private Comparable buildComparable() {
Map<String,Object> props =
MapUtil.toMap(serviceRegistration.getProperties());
-return ServiceUtil.getComparableForServiceRanking(props,
Order.DESCENDING);
+ // use ascending order as defined in ServiceReference#compareTo()
+return ServiceUtil.getComparableForServiceRanking(props,
Order.ASCENDING);
}
@Override
Modified:
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java?rev=1811972=1811971=1811972=diff
==
---
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
Thu Oct 12 14:49:29 2017
@@ -34,7 +34,9 @@ import org.osgi.framework.InvalidSyntaxE
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-/** Test the service-ranking based sorting of mock service references */
+/**
+ * Test the service-ranking based sorting of mock service references
+ */
public class MockServiceReferencesSortTest {
private BundleContext bundleContext;
@@ -57,7 +59,7 @@ public class MockServiceReferencesSortTe
registerStringServiceWithRanking("D", 1);
registerStringServiceWithRanking("E", 2);
-assertEquals("BCAED", getSortedServicesString());
+assertEquals("DEACB", getSortedServicesString());
assertEquals("B",
bundleContext.getService(bundleContext.getServiceReference(String.class)));
}
@@ -69,7 +71,7 @@ public class MockServiceReferencesSortTe
registerStringServic
svn commit: r1811965 - /sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
Author: sseifert
Date: Thu Oct 12 14:23:36 2017
New Revision: 1811965
URL: http://svn.apache.org/viewvc?rev=1811965=rev
Log:
add test cases for ensuring service ordering for getServiceReference() call
fix unit tests - service ranking has to be Integer, not Long
Modified:
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/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java?rev=1811965=1811964=1811965=diff
==
---
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
Thu Oct 12 14:23:36 2017
@@ -77,17 +77,17 @@ public class MockBundleContextTest {
// prepare test services
String[] clazzes1 = new String[] { String.class.getName(),
Integer.class.getName() };
Object service1 = new Object();
-Dictionary<String, Object> properties2 = getServiceProperties(null);
+Dictionary<String, Object> properties2 = ranking(null);
ServiceRegistration reg1 = bundleContext.registerService(clazzes1,
service1, properties2);
String clazz2 = String.class.getName();
Object service2 = new Object();
-Dictionary<String, Object> properties1 = getServiceProperties(null);
+Dictionary<String, Object> properties1 = ranking(null);
ServiceRegistration reg2 = bundleContext.registerService(clazz2,
service2, properties1);
String clazz3 = Integer.class.getName();
Object service3 = new Object();
-Dictionary<String, Object> properties3 = getServiceProperties(-100L);
+Dictionary<String, Object> properties3 = ranking(-100);
ServiceRegistration reg3 = bundleContext.registerService(clazz3,
service3, properties3);
// test get service references
@@ -130,7 +130,7 @@ public class MockBundleContextTest {
// prepare test services
Class clazz = String.class;
final String service = "abc";
-Dictionary<String, Object> properties1 = getServiceProperties(null);
+Dictionary<String, Object> properties1 = ranking(null);
ServiceRegistration reg = bundleContext.registerService(clazz, new
ServiceFactory() {
@Override
public String getService(Bundle bundle,
ServiceRegistration registration) {
@@ -164,7 +164,7 @@ public class MockBundleContextTest {
// prepare test services
String clazz1 = String.class.getName();
Object service1 = new Object();
-Dictionary<String, Object> properties1 = getServiceProperties(null);
+Dictionary<String, Object> properties1 = ranking(null);
ServiceRegistration reg1 = bundleContext.registerService(clazz1,
service1, properties1);
assertNotNull(bundleContext.getServiceReference(clazz1));
@@ -175,14 +175,6 @@ public class MockBundleContextTest {
}
-private Dictionary<String, Object> getServiceProperties(final Long
serviceRanking) {
-Dictionary<String, Object> props = new Hashtable<String, Object>();
-if (serviceRanking != null) {
-props.put(Constants.SERVICE_RANKING, serviceRanking);
-}
-return props;
-}
-
@Test
public void testGetBundles() throws Exception {
assertEquals(0, bundleContext.getBundles().length);
@@ -278,4 +270,40 @@ public class MockBundleContextTest {
assertEquals(Constants.SYSTEM_BUNDLE_LOCATION,
systemBundle.getLocation());
}
+@Test
+public void testGetServiceOrderWithRanking() {
+bundleContext.registerService(String.class, "service1", ranking(10));
+bundleContext.registerService(String.class, "service2", ranking(20));
+bundleContext.registerService(String.class, "service3", ranking(5));
+
+// should return service with highest ranking
+ServiceReference ref =
bundleContext.getServiceReference(String.class);
+String service = bundleContext.getService(ref);
+assertEquals("service2", service);
+
+bundleContext.ungetService(ref);
+}
+
+@Test
+public void testGetServiceOrderWithoutRanking() {
+bundleContext.registerService(String.class, "service1", ranking(null));
+bundleContext.registerService(String.class, "service2", ranking(null));
+bundleContext.registerService(String.class, "service3", ranking(null));
+
svn commit: r1811874 - /sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
Author: sseifert Date: Wed Oct 11 19:19:27 2017 New Revision: 1811874 URL: http://svn.apache.org/viewvc?rev=1811874=rev Log: [maven-release-plugin] prepare release maven-sling-plugin-2.3.4 Modified: sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Modified: sling/trunk/tooling/maven/maven-sling-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/pom.xml?rev=1811874=1811873=1811874=diff == --- sling/trunk/tooling/maven/maven-sling-plugin/pom.xml (original) +++ sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Wed Oct 11 19:19:27 2017 @@ -28,7 +28,7 @@ maven-sling-plugin -2.3.3-SNAPSHOT +2.3.4 maven-plugin Apache Sling Maven Sling Plugin @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/maven-sling-plugin - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/maven-sling-plugin - http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin + scm:svn:http://svn.apache.org/repos/asf/sling/tags/maven-sling-plugin-2.3.4 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/maven-sling-plugin-2.3.4 + http://svn.apache.org/viewvc/sling/tags/maven-sling-plugin-2.3.4
svn commit: r1811875 - /sling/tags/maven-sling-plugin-2.3.4/
Author: sseifert Date: Wed Oct 11 19:19:41 2017 New Revision: 1811875 URL: http://svn.apache.org/viewvc?rev=1811875=rev Log: [maven-release-plugin] copy for tag maven-sling-plugin-2.3.4 Added: sling/tags/maven-sling-plugin-2.3.4/ - copied from r1811874, sling/trunk/tooling/maven/maven-sling-plugin/
svn commit: r1811833 - /sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
Author: sseifert
Date: Wed Oct 11 14:52:52 2017
New Revision: 1811833
URL: http://svn.apache.org/viewvc?rev=1811833=rev
Log:
SLING-7189 Misleading Artifact Coordinates message for
ResourceResolverType.JCR_OAK
Modified:
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
Modified:
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
URL:
http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java?rev=1811833=1811832=1811833=diff
==
---
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
(original)
+++
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
Wed Oct 11 14:52:52 2017
@@ -79,7 +79,7 @@ public enum ResourceResolverType {
*
*/
JCR_OAK("org.apache.sling.testing.mock.sling.oak.OakMockResourceResolverAdapter",
-
"org.apache.sling:org.apache.sling.testing.sling-mock-jackrabbit-oak",
NodeTypeMode.NODETYPES_REQUIRED),
+"org.apache.sling:org.apache.sling.testing.sling-mock-oak",
NodeTypeMode.NODETYPES_REQUIRED),
/**
* Provides resource resolver environment without any ResourceProvider.
svn commit: r1811834 - /sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
Author: sseifert
Date: Wed Oct 11 14:53:00 2017
New Revision: 1811834
URL: http://svn.apache.org/viewvc?rev=1811834=rev
Log:
SLING-7189 Misleading Artifact Coordinates message for
ResourceResolverType.JCR_OAK
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java?rev=1811834=1811833=1811834=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
Wed Oct 11 14:53:00 2017
@@ -65,7 +65,7 @@ public enum ResourceResolverType {
*
*/
JCR_OAK("org.apache.sling.testing.mock.sling.oak.OakMockResourceResolverAdapter",
-
"org.apache.sling:org.apache.sling.testing.sling-mock-jackrabbit-oak",
NodeTypeMode.NODETYPES_REQUIRED),
+"org.apache.sling:org.apache.sling.testing.sling-mock-oak",
NodeTypeMode.NODETYPES_REQUIRED),
/**
* Provides resource resolver environment without any ResourceProvider.
svn commit: r1811715 - /sling/trunk/bundles/jcr/contentparser/pom.xml
Author: sseifert Date: Tue Oct 10 15:40:43 2017 New Revision: 1811715 URL: http://svn.apache.org/viewvc?rev=1811715=rev Log: set dependency scope for javax.json to provided because artifactId is different for newer version of the spec Modified: sling/trunk/bundles/jcr/contentparser/pom.xml Modified: sling/trunk/bundles/jcr/contentparser/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/pom.xml?rev=1811715=1811714=1811715=diff == --- sling/trunk/bundles/jcr/contentparser/pom.xml (original) +++ sling/trunk/bundles/jcr/contentparser/pom.xml Tue Oct 10 15:40:43 2017 @@ -81,7 +81,7 @@ org.apache.geronimo.specs geronimo-json_1.0_spec 1.0-alpha-1 -compile +provided javax.jcr
[sling-site] branch master updated: Apache Sling Context-Aware Configuration Impl 1.4.6
This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git The following commit(s) were added to refs/heads/master by this push: new 05b4edc Apache Sling Context-Aware Configuration Impl 1.4.6 05b4edc is described below commit 05b4edc074b84c097c1477644bcef6e0201ddbb7 Author: sseifert <sseif...@pro-vision.de> AuthorDate: Mon Oct 9 21:50:40 2017 +0200 Apache Sling Context-Aware Configuration Impl 1.4.6 --- src/main/jbake/content/releases.md | 1 + src/main/jbake/templates/downloads.tpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/jbake/content/releases.md b/src/main/jbake/content/releases.md index 32e78c9..92de212 100644 --- a/src/main/jbake/content/releases.md +++ b/src/main/jbake/content/releases.md @@ -8,6 +8,7 @@ This is a list of all our releases, available from our [downloads](/downloads.cg ## October 2017 +* Apache Sling Context-Aware Configuration Impl 1.4.6 (9th) * Query 4.0.0 (4th) * Thread Support 3.2.10 (2nd) diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl index 7797f8f..8ba1104 100644 --- a/src/main/jbake/templates/downloads.tpl +++ b/src/main/jbake/templates/downloads.tpl @@ -69,7 +69,7 @@ def bundles=[ "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.4.4", + "Context-Aware Configuration Impl|org.apache.sling.caconfig.impl|1.4.6", "Context-Aware Configuration Mock Plugin|org.apache.sling.testing.caconfig-mock-plugin|1.3.0", "Context-Aware Configuration SPI|org.apache.sling.caconfig.spi|1.3.2", "Crankstart API|org.apache.sling.crankstart.api|1.0.0", -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
svn commit: r22171 - /release/sling/
Author: sseifert Date: Mon Oct 9 08:15:36 2017 New Revision: 22171 Log: Apache Sling Context-Aware Configuration Impl 1.4.6 Added: release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.asc release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.4.6-source-release.zip (with props) release/sling/org.apache.sling.caconfig.impl-1.4.6-source-release.zip.asc release/sling/org.apache.sling.caconfig.impl-1.4.6-source-release.zip.md5 release/sling/org.apache.sling.caconfig.impl-1.4.6-source-release.zip.sha1 release/sling/org.apache.sling.caconfig.impl-1.4.6-sources.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.4.6-sources.jar.asc release/sling/org.apache.sling.caconfig.impl-1.4.6-sources.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.4.6-sources.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.4.6.jar (with props) release/sling/org.apache.sling.caconfig.impl-1.4.6.jar.asc release/sling/org.apache.sling.caconfig.impl-1.4.6.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.4.6.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.4.6.pom release/sling/org.apache.sling.caconfig.impl-1.4.6.pom.asc release/sling/org.apache.sling.caconfig.impl-1.4.6.pom.md5 release/sling/org.apache.sling.caconfig.impl-1.4.6.pom.sha1 Removed: release/sling/org.apache.sling.caconfig.impl-1.4.4-javadoc.jar release/sling/org.apache.sling.caconfig.impl-1.4.4-javadoc.jar.asc release/sling/org.apache.sling.caconfig.impl-1.4.4-javadoc.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.4.4-javadoc.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.4.4-source-release.zip release/sling/org.apache.sling.caconfig.impl-1.4.4-source-release.zip.asc release/sling/org.apache.sling.caconfig.impl-1.4.4-source-release.zip.md5 release/sling/org.apache.sling.caconfig.impl-1.4.4-source-release.zip.sha1 release/sling/org.apache.sling.caconfig.impl-1.4.4-sources.jar release/sling/org.apache.sling.caconfig.impl-1.4.4-sources.jar.asc release/sling/org.apache.sling.caconfig.impl-1.4.4-sources.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.4.4-sources.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.4.4.jar release/sling/org.apache.sling.caconfig.impl-1.4.4.jar.asc release/sling/org.apache.sling.caconfig.impl-1.4.4.jar.md5 release/sling/org.apache.sling.caconfig.impl-1.4.4.jar.sha1 release/sling/org.apache.sling.caconfig.impl-1.4.4.pom release/sling/org.apache.sling.caconfig.impl-1.4.4.pom.asc release/sling/org.apache.sling.caconfig.impl-1.4.4.pom.md5 release/sling/org.apache.sling.caconfig.impl-1.4.4.pom.sha1 Added: release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.asc == --- release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.asc Mon Oct 9 08:15:36 2017 @@ -0,0 +1,10 @@ +-BEGIN PGP SIGNATURE- + +iQEcBAABAgAGBQJZ1K91AAoJEM4rf/Z1146SRvAH/2qx+npvJvI6nqjTARg+mse5 +2SnzU6U/ql8+0IlIutYI3OouJII6qk9xG5wv+4w7kkIMqFuM3ryj0zybnPdslLGf +IBwGB6Q5DVhPv7X/ACpaWb5QwZXrgxOmvEDwX7vTvGvCzlLC9vUnS0A7v6oF9pQO +x93PBrBl6GTroUdsnLkytsJSdcQkRkMc9owpcugj3Kyja+/0oIvgtY8ZkREIYX4T +hA8bK5GRb3BoCiY5tRCZsM0QD1nSNLTUbswkmnm5+tOsKNXWhE5CMms/xbVqgEQ+ +Jw58PevVXTRNiJfdvjzCuUEL3zmq+zNjpWZFigt6dHcEDhv2FdC4eofZ26qJPCk= +=TZ+F +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.md5 == --- release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.md5 Mon Oct 9 08:15:36 2017 @@ -0,0 +1 @@ +74a43e96eabd49ab4ef9dcb7ed6b49f8 \ No newline at end of file Added: release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.sha1 == --- release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.caconfig.impl-1.4.6-javadoc.jar.sha1 Mon Oct 9 08:15:36 2017 @@ -0,0 +1 @@ +10dd22902df221352524a25ab831a2844cb782d8 \ No newline at end of file Added: release/sling
svn commit: r1811315 - /sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
Author: sseifert Date: Fri Oct 6 10:07:17 2017 New Revision: 1811315 URL: http://svn.apache.org/viewvc?rev=1811315=rev Log: update dependencies Modified: sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Modified: sling/trunk/tooling/maven/maven-sling-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/pom.xml?rev=1811315=1811314=1811315=diff == --- sling/trunk/tooling/maven/maven-sling-plugin/pom.xml (original) +++ sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Fri Oct 6 10:07:17 2017 @@ -119,7 +119,7 @@ org.apache.commons commons-lang3 -3.5 +3.6 compile @@ -147,9 +147,15 @@ compile +org.apache.geronimo.specs +geronimo-json_1.1_spec +1.0 +compile + + org.apache.johnzon johnzon-core -1.0.0 +1.1.3 compile
svn commit: r1811313 - in /sling/trunk/tooling/maven/maven-sling-plugin: ./ src/main/java/org/apache/sling/maven/bundlesupport/ src/main/resources/META-INF/m2e/ src/test/java/org/apache/sling/maven/bu
Author: sseifert
Date: Fri Oct 6 10:00:52 2017
New Revision: 1811313
URL: http://svn.apache.org/viewvc?rev=1811313=rev
Log:
SLING-7181 Maven Sling Plugin: Add Incremental Build Support for Validation Mojo
Added:
sling/trunk/tooling/maven/maven-sling-plugin/src/main/resources/META-INF/m2e/
sling/trunk/tooling/maven/maven-sling-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
(with props)
sling/trunk/tooling/maven/maven-sling-plugin/src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java
(with props)
Modified:
sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
Modified: sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/pom.xml?rev=1811313=1811312=1811313=diff
==
--- sling/trunk/tooling/maven/maven-sling-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Fri Oct 6 10:00:52
2017
@@ -213,6 +213,12 @@
3.4
provided
+
+org.sonatype.plexus
+plexus-build-api
+0.0.7
+compile
+
junit
Modified:
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java?rev=1811313=1811312=1811313=diff
==
---
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
(original)
+++
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
Fri Oct 6 10:00:52 2017
@@ -21,20 +21,29 @@ package org.apache.sling.maven.bundlesup
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.json.JsonException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.CharEncoding;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.Scanner;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
* The validate goal checks the JSON code of a bundle.
@@ -42,6 +51,10 @@ import org.codehaus.plexus.util.Director
@Mojo(name = "validate", defaultPhase = LifecyclePhase.PROCESS_RESOURCES)
public class ValidationMojo extends AbstractMojo {
+private static final Pattern LINE_NUMBER_PATTERN =
Pattern.compile("lineNumber=(\\d+),");
+private static final Pattern COLUMN_NUMBER_PATTERN =
Pattern.compile("columnNumber=(\\d+),");
+private static final Pattern MESSAGE_CLEANUP_PATTERN =
Pattern.compile("^(.*) on \\[lineNumber=\\d+, columnNumber=\\d+,
streamOffset=\\d+\\](.*)$", Pattern.DOTALL);
+
/**
* The Maven project.
*/
@@ -67,24 +80,32 @@ public class ValidationMojo extends Abst
@Parameter(property = "sling.validation.jsonQuoteTick", defaultValue =
"false", required = false)
private boolean jsonQuoteTick;
+@Component
+private BuildContext buildContext;
+
/**
* @see org.apache.maven.plugin.AbstractMojo#execute()
*/
-public void execute()
-throws MojoExecutionException {
+public void execute() throws MojoExecutionException, MojoFailureException {
if ( this.skip ) {
getLog().info("Validation is skipped.");
return;
}
+
final Iterator rsrcIterator =
this.project.getResources().iterator();
while ( rsrcIterator.hasNext() ) {
final Resource rsrc = rsrcIterator.next();
final File directory = new File(rsrc.getDirectory());
if ( directory.exists() ) {
+
+if (!buildContext.hasDelta(directory)) {
+getLog().debug
svn commit: r1811060 - /sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml
Author: sseifert Date: Wed Oct 4 09:57:45 2017 New Revision: 1811060 URL: http://svn.apache.org/viewvc?rev=1811060=rev Log: update to latest development version 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=1811060=1811059=1811060=diff == --- sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/integration-tests/pom.xml Wed Oct 4 09:57:45 2017 @@ -157,7 +157,7 @@ org.apache.sling org.apache.sling.caconfig.impl -1.4.5-SNAPSHOT +1.4.7-SNAPSHOT provided
svn commit: r1811058 - /sling/tags/org.apache.sling.caconfig.impl-1.4.6/
Author: sseifert Date: Wed Oct 4 09:52:03 2017 New Revision: 1811058 URL: http://svn.apache.org/viewvc?rev=1811058=rev Log: [maven-release-plugin] copy for tag org.apache.sling.caconfig.impl-1.4.6 Added: sling/tags/org.apache.sling.caconfig.impl-1.4.6/ - copied from r1811057, sling/trunk/bundles/extensions/caconfig/impl/
svn commit: r1811059 - /sling/trunk/bundles/extensions/caconfig/impl/pom.xml
Author: sseifert Date: Wed Oct 4 09:52:05 2017 New Revision: 1811059 URL: http://svn.apache.org/viewvc?rev=1811059=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=1811059=1811058=1811059=diff == --- sling/trunk/bundles/extensions/caconfig/impl/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/impl/pom.xml Wed Oct 4 09:52:05 2017 @@ -29,14 +29,14 @@ org.apache.sling.caconfig.impl bundle -1.4.6 +1.4.7-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.4.6 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.caconfig.impl-1.4.6 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.caconfig.impl-1.4.6 + 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: r1811057 - /sling/trunk/bundles/extensions/caconfig/impl/pom.xml
Author: sseifert Date: Wed Oct 4 09:51:50 2017 New Revision: 1811057 URL: http://svn.apache.org/viewvc?rev=1811057=rev Log: [maven-release-plugin] prepare release org.apache.sling.caconfig.impl-1.4.6 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=1811057=1811056=1811057=diff == --- sling/trunk/bundles/extensions/caconfig/impl/pom.xml (original) +++ sling/trunk/bundles/extensions/caconfig/impl/pom.xml Wed Oct 4 09:51:50 2017 @@ -29,14 +29,14 @@ org.apache.sling.caconfig.impl bundle -1.4.5-SNAPSHOT +1.4.6 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.4.6 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.caconfig.impl-1.4.6 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.caconfig.impl-1.4.6
svn commit: r1810672 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Tue Oct 3 08:56:44 2017 New Revision: 1810672 URL: http://svn.apache.org/viewvc?rev=1810672=rev Log: update dependency on servlet-helpers 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=1810672=1810671=1810672=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Oct 3 08:56:44 2017 @@ -63,7 +63,7 @@ org.apache.sling org.apache.sling.servlet-helpers -1.1.0 +1.1.1-SNAPSHOT compile
svn commit: r1810196 - in /sling/trunk/bundles/extensions/caconfig/impl/src: main/java/org/apache/sling/caconfig/impl/ test/java/org/apache/sling/caconfig/example/ test/java/org/apache/sling/caconfig/
Author: sseifert
Date: Sat Sep 30 11:26:03 2017
New Revision: 1810196
URL: http://svn.apache.org/viewvc?rev=1810196=rev
Log:
SLING-7165 fix problem with resolving config collection item name for nested
configuration lists
Added:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListDoubleNestedConfig.java
(with props)
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverCustomPersistence2Test.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverCustomPersistenceTest.java
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java?rev=1810196=1810195=1810196=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
Sat Sep 30 11:26:03 2017
@@ -27,7 +27,9 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections.ResettableListIterator;
import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections.iterators.ListIteratorWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
@@ -144,8 +146,8 @@ class ConfigurationBuilderImpl implement
.getResourceCollectionInheritanceChain(this.contentResource, configBucketNames,
collectionParentConfigName);
if (result != null) {
resourceInheritanceChains.addAll(result);
+ }
}
- }
final Collection result = new ArrayList<>();
if (resourceInheritanceChains != null) {
@@ -169,8 +171,9 @@ class ConfigurationBuilderImpl implement
Resource configResource = null;
String conversionName = name;
if (resourceInhertianceChain != null) {
+ResettableListIterator resettableResourceInhertianceChain = new
ListIteratorWrapper(resourceInhertianceChain);
// apply persistence transformation
-Iterator transformedResources =
IteratorUtils.transformedIterator(resourceInhertianceChain,
+Iterator transformedResources =
IteratorUtils.transformedIterator(resettableResourceInhertianceChain,
new Transformer() {
@Override
public Object transform(Object input) {
@@ -187,8 +190,14 @@ class ConfigurationBuilderImpl implement
// apply overrides
configResource =
configurationOverrideMultiplexer.overrideProperties(contentResource.getPath(),
name, configResource, configResource.getResourceResolver());
// build name
-if (configResource != null && isCollection) {
-conversionName = conversionName + "/" +
configResource.getName();
+if (isCollection) {
+// get untransformed resource for getting collection item name
+resettableResourceInhertianceChain.reset();
+Resource untransformedConfigResource =
configurationInheritanceStrategy.getResource(resettableResourceInhertianceChain);
+if (untransformedConfigResource != null && configResource !=
null) {
+conversionName =
configurationPersistenceStrategy.getCollectionParentConfigName(conversionName,
configResource.getPath())
++ "/" + untransformedConfigResource.getName();
+}
}
}
if (log.isTraceEnabled() && configResource != null) {
Added:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListDoubleNestedConfig.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListDoubleNestedConfig.java?rev=1810196=auto
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListDoubleNestedConfig.java
(added)
svn commit: r1810182 - in /sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig: example/ListNestedConfig.java impl/ConfigurationResolverAnnotationClassTest.java impl/d
Author: sseifert
Date: Sat Sep 30 07:37:56 2017
New Revision: 1810182
URL: http://svn.apache.org/viewvc?rev=1810182=rev
Log:
SLING-7165 more unit tests
Added:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListNestedConfig.java
(with props)
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java
Added:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListNestedConfig.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListNestedConfig.java?rev=1810182=auto
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListNestedConfig.java
(added)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListNestedConfig.java
Sat Sep 30 07:37:56 2017
@@ -0,0 +1,32 @@
+/*
+ * 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.caconfig.example;
+
+import org.apache.sling.caconfig.annotation.Configuration;
+
+@Configuration(collection = true)
+public @interface ListNestedConfig {
+
+String stringParam();
+
+int intParam();
+
+ListConfig[] subListConfig();
+
+}
Propchange:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListNestedConfig.java
--
svn:eol-style = native
Propchange:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListNestedConfig.java
--
--- svn:keywords (added)
+++ svn:keywords Sat Sep 30 07:37:56 2017
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/example/ListNestedConfig.java
--
svn:mime-type = text/plain
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java?rev=1810182=1810181=1810182=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
Sat Sep 30 07:37:56 2017
@@ -35,6 +35,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.caconfig.ConfigurationResolveException;
import org.apache.sling.caconfig.ConfigurationResolver;
import org.apache.sling.caconfig.example.ListConfig;
+import org.apache.sling.caconfig.example.ListNestedConfig;
import org.apache.sling.caconfig.example.NestedConfig;
import org.apache.sling.caconfig.example.SimpleConfig;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
@@ -141,17 +142,52 @@ public class ConfigurationResolverAnnota
public void testConfig_List() {
context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.ListConfig")
.siblingsMode()
-.resource("1", "stringParam", "configValue1.1")
-.resource("2", "stringParam", "configValue1.2")
-.resource("3", "stringParam", "configValue1.3");
+.resource(&qu
svn commit: r1810138 - in /sling/trunk/bundles/extensions/caconfig/impl/src: main/java/org/apache/sling/caconfig/impl/def/ test/java/org/apache/sling/caconfig/impl/def/
Author: sseifert
Date: Fri Sep 29 17:01:44 2017
New Revision: 1810138
URL: http://svn.apache.org/viewvc?rev=1810138=rev
Log:
SLING-7165 CAConfig Impl: Potential data loss when saving multiple nested
configuration lists
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/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.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=1810138=1810137=1810138=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
Fri Sep 29 17:01:44 2017
@@ -169,7 +169,7 @@ public class DefaultConfigurationPersist
Resource configResourceParent = getOrCreateResource(resourceResolver,
configResourceCollectionParentPath, data.getProperties());
// delete existing children and create new ones
-deleteChildren(configResourceParent);
+deleteChildrenNotInCollection(configResourceParent, data);
for (ConfigurationPersistData item : data.getItems()) {
String path = configResourceParent.getPath() + "/" +
item.getCollectionItemName();
getOrCreateResource(resourceResolver, path, item.getProperties());
@@ -211,12 +211,25 @@ public class DefaultConfigurationPersist
}
}
-private void deleteChildren(Resource resource) {
+/**
+ * Delete children that are no longer contained in list of collection
items.
+ * @param resource Parent resource
+ * @param data List of collection items
+ */
+private void deleteChildrenNotInCollection(Resource resource,
ConfigurationCollectionPersistData data) {
ResourceResolver resourceResolver = resource.getResourceResolver();
+
+Set collectionItemNames = new HashSet<>();
+for (ConfigurationPersistData item : data.getItems()) {
+collectionItemNames.add(item.getCollectionItemName());
+}
+
try {
for (Resource child : resource.getChildren()) {
-log.trace("! Delete resource {}", child.getPath());
-resourceResolver.delete(child);
+if (!collectionItemNames.contains(child.getName())) {
+log.trace("! Delete resource {}", child.getPath());
+resourceResolver.delete(child);
+}
}
}
catch (PersistenceException ex) {
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java?rev=1810138=1810137=1810138=diff
==
---
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java
Fri Sep 29 17:01:44 2017
@@ -32,6 +32,7 @@ import org.apache.sling.caconfig.spi.Con
import org.apache.sling.caconfig.spi.ConfigurationPersistData;
import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy2;
import org.apache.sling.hamcrest.ResourceMatchers;
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
@@ -43,7 +44,7 @@ import com.google.common.collect.Immutab
public class DefaultConfigurationPersistenceStrategyTest {
@Rule
-public SlingContext context = new SlingContext();
+public SlingContext context = new
SlingContext(ResourceResolverType.JCR_MOCK);
@Before
public void setUp() {
@@ -113,22 +114,97 @@ public class DefaultConfigurationPersist
// store new config collection items
assertTrue(underTest.persistConfigurationCollection(context.resourceResolver(),
"/conf/test",
new ConfigurationCollectionPersistData(ImmutableList.of(
-new
Config
svn commit: r1809986 - /sling/whiteboard/cziegeler/feature/readme.md
Author: sseifert Date: Thu Sep 28 13:01:28 2017 New Revision: 1809986 URL: http://svn.apache.org/viewvc?rev=1809986=rev Log: fix typo in json example Modified: sling/whiteboard/cziegeler/feature/readme.md Modified: sling/whiteboard/cziegeler/feature/readme.md URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/readme.md?rev=1809986=1809985=1809986=diff == --- sling/whiteboard/cziegeler/feature/readme.md (original) +++ sling/whiteboard/cziegeler/feature/readme.md Thu Sep 28 13:01:28 2017 @@ -192,7 +192,7 @@ This is a feature example: }, "org.apache.sling/application-bundle/2.0.0", "org.apache.sling/another-bundle/2.1.0" - ] + ], "2" : [ "org.apache.sling/foo-xyz/1.2.3" ]
svn commit: r1018581 - /websites/production/sling/content/
Author: sseifert Date: Sat Sep 23 12:52:50 2017 New Revision: 1018581 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1018580, websites/staging/sling/trunk/content/
svn commit: r1018579 - /websites/production/sling/content/
Author: sseifert Date: Sat Sep 23 12:51:52 2017 New Revision: 1018579 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r1018578, websites/staging/sling/trunk/content/
svn commit: r1809420 - /sling/site/trunk/content/components/maven-sling-plugin/
Author: sseifert Date: Sat Sep 23 12:50:45 2017 New Revision: 1809420 URL: http://svn.apache.org/viewvc?rev=1809420=rev Log: Apache Sling Maven Sling Plugin 2.3.2 Added: sling/site/trunk/content/components/maven-sling-plugin/ - copied from r1809419, sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-2.3.2/
svn commit: r1809419 - in /sling/site/trunk/content/components: maven-sling-plugin-archives/maven-sling-plugin-2.3.2/ maven-sling-plugin-archives/maven-sling-plugin-LATEST/ maven-sling-plugin/
Author: sseifert Date: Sat Sep 23 12:50:29 2017 New Revision: 1809419 URL: http://svn.apache.org/viewvc?rev=1809419=rev Log: Apache Sling Maven Sling Plugin 2.3.2 Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-2.3.2/ - copied from r1809418, sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/ Removed: sling/site/trunk/content/components/maven-sling-plugin/ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/
svn commit: r1809416 [4/8] - in /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg?rev=1809416=auto == --- sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg (added) +++ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg Sat Sep 23 12:44:40 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: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg -- svn:eol-style = native Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg -- --- svn:keywords (added) +++ svn:keywords Sat Sep 23 12:44:40 2017 @@ -0,0 +1 @@ +LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg -- svn:mime-type = text/plain Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.ttf URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.ttf?rev=1809416=auto == Binary file - no diff available. Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.ttf -- svn:mime-type = application/octet-stream Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.woff URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.woff?rev=1809416=auto == Binary file - no diff available. Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.woff -- svn:mime-type = application/octet-stream Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html?rev=1809416=auto == --- sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html (added) +++ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html Sat Sep 23 12:44:40 2017 @@ -0,0 +1,585 @@ + + +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-09-23| + + Version: 2.3.2 + + + + + + + Overview +Introduction +Goals + Project Documentation +Project Information +Project Reports + + + + + + + + http://maven.apache.org/; title="Built by Maven" class="poweredBy"> + + + + + + + +sling:fsmount + +Full name: +
svn commit: r1809416 [8/8] - in /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/uninstall-mojo.html URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/uninstall-mojo.html?rev=1809416=auto == --- sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/uninstall-mojo.html (added) +++ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/uninstall-mojo.html Sat Sep 23 12:44:40 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-09-23| + + Version: 2.3.2 + + + + + + + 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.3.2: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
svn commit: r1809416 [6/8] - in /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added:
sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/install-mojo.html
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/install-mojo.html?rev=1809416=auto
==
---
sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/install-mojo.html
(added)
+++
sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/install-mojo.html
Sat Sep 23 12:44:40 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-09-23|
+
+ Version: 2.3.2
+
+
+
+
+
+
+ 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.3.2: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.
+
+
+
+
svn commit: r1809416 [3/8] - in /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html -- svn:eol-style = native Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html -- --- svn:keywords (added) +++ svn:keywords Sat Sep 23 12:44:40 2017 @@ -0,0 +1 @@ +LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html -- svn:mime-type = text/plain Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html?rev=1809416=auto == --- sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html (added) +++ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html Sat Sep 23 12:44:40 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-09-23| + + Version: 2.3.2 + + + + + + + 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.3.2/version + typemaven-plugin/type +/dependency + +Apache Buildr +'org.apache.sling:maven-sling-plugin:maven-plugin:2.3.2' + +Apache Ivy +dependency org=org.apache.sling name=maven-sling-plugin rev=2.3.2 + artifact name=maven-sling-plugin type=maven-plugin / +/dependency + +Groovy Grape +@Grapes( +@Grab(group='org.apache.sling', module='maven-sling-plugin', version='2.3.2') +) + +Gradle/Grails +compile 'org.apache.sling:maven-sling-plugin:2.3.2' + +Scala SBT +libraryDependencies += org.apache.sling % maven-sling-plugin % 2.3.2 + +Leiningen +[org.apache.sling/maven-sling-plugin 2.3.2] + + + + + + + +Copyright 20072017 +https://www.apache.org/;>The Apache Software Foundation. +All rights reserved. + + + + + \ No newline at end of file Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html -- svn:eol-style = native Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html -- --- svn:keywords (added) +++ svn:keywords Sat Sep 23 12:44:40 2017 @@ -0,0 +1 @@ +LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author Propchange: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html -- svn:mime-type = text/plain Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html?rev=1809416=auto == --- sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html (added) +++ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html Sat Sep 23 12:44:40 2017 @@ -0,0 +1,200 @@ + +
svn commit: r1809416 [1/8] - in /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Author: sseifert Date: Sat Sep 23 12:44:40 2017 New Revision: 1809416 URL: http://svn.apache.org/viewvc?rev=1809416=rev Log: Site checkin for project Apache Sling Maven Sling Plugin Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/css/ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/css/apache-maven-fluido-1.6.min.css (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/css/print.css (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/css/site.css (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-info.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependency-management.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/deploy-file-mojo.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/deploy-mojo.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/distribution-management.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.eot (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.svg (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.ttf (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fonts/glyphicons-halflings-regular.woff (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsmount-mojo.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/generate-adapter-metadata-mojo.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/help-mojo.html (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/accessories-text-editor.png (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/add.gif (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/apache-maven-project-2.png (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/application-certificate.png (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/close.gif (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/contact-new.png (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/document-properties.png (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/drive-harddisk.png (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/fix.gif (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_error_sml.gif (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_help_sml.gif (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_info_sml.gif (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_success_sml.gif (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/icon_warning_sml.gif (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/image-x-generic.png (with props) sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/images/internet-web
svn commit: r1809416 [7/8] - in /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/plugin-management.html URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/plugin-management.html?rev=1809416=auto == --- sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/plugin-management.html (added) +++ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/plugin-management.html Sat Sep 23 12:44:40 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-09-23| + + Version: 2.3.2 + + + + + + + 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 +
svn commit: r1809416 [5/8] - in /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added:
sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html?rev=1809416=auto
==
---
sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html
(added)
+++
sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/fsunmount-mojo.html
Sat Sep 23 12:44:40 2017
@@ -0,0 +1,396 @@
+
+
+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-09-23|
+
+ Version: 2.3.2
+
+
+
+
+
+
+ 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.3.2: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.
+
+Since version: 2.2.0.
+
+
+
+Required Parameters
+
+
+
+
+
+Name
+
+Type
+
+Since
+
+Description
+
+
+
+
+bundleFileName
+
+String
+
+2.2.0
+
+The name of the generated JAR file.Default value is:
${project.build.directory}/${project.build.finalName}.jar.User property is: sling.file.
+
+
+
+
+failOnError
+
+boolean
+
+2.2.0
+
+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
+
+2.2.0
+
+The password to authenticate at the running Sling instance.Default value is: admin.User property is:
sling.password.
+
+
+
+
+slingUrl
+
+String
+
+2.2.0
+
+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
+
+2.2.0
+
+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
+
+2.2.0
+
+Path to META-INF/vault/filter.xml when using FileVault XML
+filesystem layout.User property is:
sling.filevault.filterxml.file.
+
+
+
+
+fileVaultJcrRootFile
+
+File
+
+2.2.0
+
+FileVault filesystem layout content root folder.User property
is: sling.filevault.jcr_root.file.
+
+
+
+
+slingConsoleUrl
+
+String
+
+2.2.0
+
+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
+
+2.2.0
+
+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
+
+Since: 2.2.0
+
+Required: Yes
+
+User
svn commit: r1809416 [2/8] - in /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST: ./ css/ fonts/ images/ images/logos/ images/profiles/ img/ js/
Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html URL: http://svn.apache.org/viewvc/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html?rev=1809416=auto == --- sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html (added) +++ sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/dependencies.html Sat Sep 23 12:44:40 2017 @@ -0,0 +1,2061 @@ + + +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-09-23| + + Version: 2.3.2 + + + + + + + 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.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 +maven-artifact +3.0.4 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 + +org.apache.maven +maven-compat +3.0.4 +jar +http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 + +org.apache.maven +maven-plugin-api +3.0.4 +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 + +org.apache.sling +http://sling.apache.org/org.apache.sling.jcr.contentparser;>org.apache.sling.jcr.contentparser +1.2.4 +jar +https://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
svn commit: r1809415 - /sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/
Author: sseifert Date: Sat Sep 23 12:43:51 2017 New Revision: 1809415 URL: http://svn.apache.org/viewvc?rev=1809415=rev Log: Automatic svn path creation: https://svn.apache.org/repos/asf/sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST Added: sling/site/trunk/content/components/maven-sling-plugin-archives/maven-sling-plugin-LATEST/
