Build failed in Jenkins: sling-launchpad-builder-1.8 #326

2016-12-01 Thread Apache Jenkins Server 
See 

--
Started by upstream project "sling-bundles-jcr-oak-server-1.7" build number 121
originally caused by:
 Started by timer
[EnvInject] - Loading node environment variables.
Building remotely on H18 (ubuntu) in workspace 

Updating https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder at 
revision '2016-12-01T12:15:12.249 +'
A src/main/provisioning/composum.txt
U src/main/provisioning/boot.txt
U src/main/provisioning/repoinit.txt
U src/main/provisioning/sling.txt
At revision 1772183

No changes for https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder 
since the previous build
Parsing POMs
Established TCP socket on 40311
maven32-agent.jar already up to date
maven32-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[sling-launchpad-builder-1.8] $ /home/jenkins/tools/java/latest1.8/bin/java 
-Xmx2g -Xms256m -XX:MaxPermSize=512m -cp 
/home/jenkins/jenkins-slave/maven32-agent.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/boot/plexus-classworlds-2.5.2.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/conf/logging
 jenkins.maven3.agent.Maven32Main /home/jenkins/tools/maven/apache-maven-3.3.9 
/home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven32-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 40311
Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=512m; 
support was removed in 8.0
<===[JENKINS REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 
-Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 -U clean 
deploy
[INFO] Scanning for projects...
[INFO] 
[INFO] 
[INFO] Building Apache Sling Launchpad Application Builder 9-SNAPSHOT
[INFO] 
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.log/5.0.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.log/5.0.1-SNAPSHOT/maven-metadata.xml
 (1008 B at 2.2 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.core/3.8.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.core/3.8.1-SNAPSHOT/maven-metadata.xml
 (1011 B at 2.5 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.core/3.8.1-SNAPSHOT/org.apache.sling.installer.core-3.8.1-20161123.143105-5.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.core/3.8.1-SNAPSHOT/org.apache.sling.installer.core-3.8.1-20161123.143105-5.pom
 (7 KB at 17.5 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-commons/1.6.0/composum-sling-core-commons-1.6.0.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-commons/1.6.0/composum-sling-core-commons-1.6.0.pom
 (11 KB at 36.8 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-parent/1.6.0/composum-sling-core-parent-1.6.0.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-parent/1.6.0/composum-sling-core-parent-1.6.0.pom
 (24 KB at 611.8 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/yahoo/platform/yui/yuicompressor/2.4.8/yuicompressor-2.4.8.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/yahoo/platform/yui/yuicompressor/2.4.8/yuicompressor-2.4.8.pom
 (2 KB at 107.7 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-console/1.6.0/composum-sling-core-console-1.6.0.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-console/1.6.0/composum-sling-core-console-1.6.0.pom
 (10 KB at 485.0 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-jslibs/1.6.0/composum-sling-core-jslibs-1.6.0.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-jslibs/1.6.0/composum-sling-core-jslibs-1.6.0.pom
 (6 KB at 269.1 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-package-manager/1.6.0/composum-sling-package-manager-1.6.0.pom
[INFO] Downloaded: 
https://repo.maven.

svn commit: r1772244 - in /sling/trunk/contrib/extensions/contextaware-config: impl/src/main/java/org/apache/sling/caconfig/impl/ impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ impl/src/m

2016-12-01 Thread sseifert 
Author: sseifert
Date: Thu Dec  1 18:05:41 2016
New Revision: 1772244

URL: http://svn.apache.org/viewvc?rev=1772244&view=rev
Log:
SLING-6338 enhance nested configuration handling
refactor SPI metadata classes to make them fluent

Added:

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ConfigNameUtil.java
   (with props)

sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ConfigNameUtilTest.java
   (with props)
Modified:

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParser.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationManager.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexerTest.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplNoDefaultTest.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/console/CAConfigInventoryPrinterTest.java

sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceStrategy.java

sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/AbstractMetadata.java

sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadata.java

sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java

sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java

sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java?rev=1772244&r1=1772243&r2=1772244&view=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
 Thu Dec  1 18:05:41 2016
@@ -27,7 +27,6 @@ import java.util.Iterator;
 
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.collections.Transformer;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.api.resource.ValueMap;
@@ -37,6 +36,7 @@ import org.apache.sling.caconfig.Configu
 import org.apache.sling.caconfig.impl.ConfigurationProxy.ChildResolver;
 import org.apache.sling.caconfig.impl.metadata.AnnotationClassParser;
 import org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager;
+import org.apache.sling.caconfig.resource.impl.util.ConfigNameUtil;
 import 
org.apache.sling.caconfig.resource.spi.ConfigurationResourceResolvingStrategy;
 import org.apache.sling.caconfig.spi.ConfigurationInheritanceStrategy;
 import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy;
@@ -68,26 +68,12 @@ class ConfigurationBuilderImpl implement
 
 @Override
 public ConfigurationBuilder name(String configName) {
-if (!isNameValid(configName)) {
-throw new IllegalArgumentException("Invalid configuration name: " 
+ configName);
-}
+

Jenkins build became unstable: sling-contrib-extensions-contextaware-config-integration-tests-1.8 #228

2016-12-01 Thread Apache Jenkins Server 
See

svn commit: r1772261 - /sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java

2016-12-01 Thread sseifert 
Author: sseifert
Date: Thu Dec  1 20:23:41 2016
New Revision: 1772261

URL: http://svn.apache.org/viewvc?rev=1772261&view=rev
Log:
SLING-6338 test cases for persisting nested config data

Modified:

sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java?rev=1772261&r1=1772260&r2=1772261&view=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
 Thu Dec  1 20:23:41 2016
@@ -564,8 +564,8 @@ public class ConfigurationManagerImplTes
 assertEquals(ImmutableSet.of("prop1", "propSub", "propSubList", 
"prop4"), configData.getPropertyNames());
 assertEquals("value1", configData.getValues().get("prop1", 
String.class));
 assertEquals("value1", configData.getEffectiveValues().get("prop1", 
String.class));
-assertEquals(true, configData.getValues().get("prop4", false));
-assertEquals(true, configData.getEffectiveValues().get("prop4", 
false));
+assertTrue(configData.getValues().get("prop4", false));
+assertTrue(configData.getEffectiveValues().get("prop4", false));
 
 assertEquals(ConfigurationMetadata.class, 
configData.getValueInfo("propSub").getPropertyMetadata().getType());
 assertEquals(ConfigurationMetadata[].class, 
configData.getValueInfo("propSubList").getPropertyMetadata().getType());
@@ -583,8 +583,8 @@ public class ConfigurationManagerImplTes
 
 assertNull(subData.getValues().get("prop1", String.class));
 assertEquals("propSubValue1", 
subData.getEffectiveValues().get("prop1", String.class));
-assertNull(subData.getValues().get("prop4", String.class));
-assertEquals(true, subData.getEffectiveValues().get("prop4", false));
+assertFalse(subData.getValues().get("prop4", false));
+assertTrue(subData.getEffectiveValues().get("prop4", false));
 
 // propSub/propSubLevel2
 ConfigurationData subDataLevel2 = 
subData.getValues().get("propSubLevel2", ConfigurationData.class);
@@ -597,8 +597,8 @@ public class ConfigurationManagerImplTes
 
 assertNull(subDataLevel2.getValues().get("prop1", String.class));
 assertEquals("propSubLevel2Value1", 
subDataLevel2.getEffectiveValues().get("prop1", String.class));
-assertNull(subDataLevel2.getValues().get("prop4", String.class));
-assertEquals(true, subDataLevel2.getEffectiveValues().get("prop4", 
false));
+assertFalse(subDataLevel2.getValues().get("prop4", false));
+assertTrue(subDataLevel2.getEffectiveValues().get("prop4", false));
 
 // propSubList
 ConfigurationData[] subListData = 
configData.getValues().get("propSubList", ConfigurationData[].class);
@@ -622,8 +622,8 @@ public class ConfigurationManagerImplTes
 
 assertNull(subListDataItem1Sub.getValues().get("prop1", String.class));
 assertEquals("propSubList1_proSubValue1", 
subListDataItem1Sub.getEffectiveValues().get("prop1", String.class));
-assertNull(subListDataItem1Sub.getValues().get("prop4", String.class));
-assertEquals(true, 
subListDataItem1Sub.getEffectiveValues().get("prop4", false));
+assertFalse(subListDataItem1Sub.getValues().get("prop4", false));
+assertTrue(subListDataItem1Sub.getEffectiveValues().get("prop4", 
false));
 }
 
 @Test
@@ -744,4 +744,40 @@ public class ConfigurationManagerImplTes
 assertEquals(getConfigPropsPath("a/b"), 
underTest.getPersistenceResourcePath("a/b"));
 }
 
+@Test
+public void testPersistConfiguration_Nested() throws Exception {
+underTest.persistConfiguration(contextResourceLevel2, 
getConfigPropsPath(getConfigPropsPath(CONFIG_NESTED_NAME)
++ "/propSub") + "/propSubLevel2",
+new ConfigurationPersistData(ImmutableMap.of("prop1", "value1_persist")));
+context.resourceResolver().commit();
+
+ConfigurationData configData = 
underTest.getConfiguration(contextResourceLevel2, CONFIG_NESTED_NAME);
+ConfigurationData subData = configData.getValues().get("propSub", 
ConfigurationData.class);
+ConfigurationData subDataLevel2 = 
subData.getValues().get("propSubLevel2", ConfigurationData.class);
+
+assertEquals("value1_persist", subDataLevel2.g

Jenkins build is still unstable: sling-contrib-extensions-contextaware-config-integration-tests-1.8 #229

2016-12-01 Thread Apache Jenkins Server 
See

svn commit: r1772272 - in /sling/trunk/bundles/scripting: api/pom.xml core/pom.xml

2016-12-01 Thread justin 
Author: justin
Date: Thu Dec  1 20:59:28 2016
New Revision: 1772272

URL: http://svn.apache.org/viewvc?rev=1772272&view=rev
Log:
use latest snapshot to get trunk build to work locally (should revert to 2.16.0 
after release passes)

Modified:
sling/trunk/bundles/scripting/api/pom.xml
sling/trunk/bundles/scripting/core/pom.xml

Modified: sling/trunk/bundles/scripting/api/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=1772272&r1=1772271&r2=1772272&view=diff
==
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Thu Dec  1 20:59:28 2016
@@ -56,7 +56,7 @@
 
 org.apache.sling
 org.apache.sling.api
-2.15.1-SNAPSHOT
+2.16.1-SNAPSHOT
 provided
 
 

Modified: sling/trunk/bundles/scripting/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1772272&r1=1772271&r2=1772272&view=diff
==
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Thu Dec  1 20:59:28 2016
@@ -124,7 +124,7 @@
 
 org.apache.sling
 org.apache.sling.api
-2.15.1-SNAPSHOT
+2.16.1-SNAPSHOT
 provided

svn commit: r1772273 - in /sling/trunk/bundles/extensions/models: impl/ impl/src/main/java/org/apache/sling/models/impl/ impl/src/main/java/org/apache/sling/models/impl/injectors/ impl/src/test/java/o

2016-12-01 Thread justin 
Author: justin
Date: Thu Dec  1 20:59:38 2016
New Revision: 1772273

URL: http://svn.apache.org/viewvc?rev=1772273&view=rev
Log:
SLING-6354 - fix support for SlingBindings injections in ExportServlet

Added:

sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExporterScriptEngineFactory.java

sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/services/TestBindingsValuesProvider.java
Modified:
sling/trunk/bundles/extensions/models/impl/pom.xml

sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java

sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java

sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelPackageBundleListener.java

sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java

sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/OSGiInjectionTest.java

sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/StaticInjectionAPFLoadOrderTest.java

sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/BaseRequestComponent.java

sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java

sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeRequest.java

Modified: sling/trunk/bundles/extensions/models/impl/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/pom.xml?rev=1772273&r1=1772272&r2=1772273&view=diff
==
--- sling/trunk/bundles/extensions/models/impl/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/impl/pom.xml Thu Dec  1 20:59:38 2016
@@ -50,9 +50,9 @@
 
 
 *;scope=compile,
-
org.osgi.compendium;inline="org/osgi/util/tracker/*"
-
-
org.apache.sling.commons.osgi
+org.apache.sling.commons.osgi;inline=true,
+
org.apache.sling.scripting.core;inline="org/apache/sling/scripting/core/impl/helper/ProtectedBindings.class"
+
 
 
 
@@ -88,6 +88,18 @@
 provided
 
 
+org.apache.sling
+org.apache.sling.scripting.api
+2.1.6
+provided
+
+
+org.apache.sling
+org.apache.sling.scripting.core
+2.0.20
+provided
+
+
 org.slf4j
 slf4j-api
 provided

Modified: 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java?rev=1772273&r1=1772272&r2=1772273&view=diff
==
--- 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java
 (original)
+++ 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java
 Thu Dec  1 20:59:38 2016
@@ -19,39 +19,75 @@
 package org.apache.sling.models.impl;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
+import javax.script.ScriptEngineFactory;
+import javax.script.SimpleBindings;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.scripting.SlingBindings;
+import org.apache.sling.api.scripting.SlingScriptHelper;
 import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
 import org.apache.sling.models.factory.ExportException;
 import org.apache.sling.models.factory.MissingExporterException;
 import org.apache.sling.models.factory.ModelFactory;
+import org.apache.sling.scripting.api.BindingsValuesProvider;
+import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
+import org.apache.sling.scripting.core.ScriptHelper;
+import org.apache.sling.scripting.core.impl.helper.ProtectedBindings;
+import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.sling.api.scripting.SlingBindings.*;
+
 @SuppressWarnings("

Jenkins build became unstable: sling-bundles-extensions-models-integration-tests-1.7 #20

2016-12-01 Thread Apache Jenkins Server 
See

Jenkins build became unstable: sling-bundles-extensions-models-integration-tests-1.8 #22

2016-12-01 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : sling-bundles-extensions-models-integration-tests-1.8 #23

2016-12-01 Thread Apache Jenkins Server 
See

Build failed in Jenkins: sling-bundles-extensions-models-integration-tests-1.7 #21

2016-12-01 Thread Apache Jenkins Server 
See 


--
Started by upstream project "sling-bundles-extensions-models-impl-1.7" build 
number 14
originally caused by:
 Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu-6 (ubuntu) in workspace 

Updating 
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/integration-tests
 at revision '2016-12-01T21:17:41.513 +'
At revision 1772277

WARNING: clock of the subversion server appears to be out of sync. This can 
result in inconsistent check out behavior.
No changes for 
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/integration-tests
 since the previous build
Parsing POMs
Established TCP socket on 47179
maven32-agent.jar already up to date
maven32-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[sling-bundles-extensions-models-integration-tests-1.7] $ 
/home/jenkins/tools/java/latest1.7/bin/java -Xmx2g -Xms256m 
-XX:MaxPermSize=512m -cp 
/home/jenkins/jenkins-slave/maven32-agent.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/boot/plexus-classworlds-2.5.2.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/conf/logging
 jenkins.maven3.agent.Maven32Main /home/jenkins/tools/maven/apache-maven-3.3.9 
/home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven32-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 47179
<===[JENKINS REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 

 -Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/1 -U clean 
deploy
[INFO] Scanning for projects...
[INFO] 
[INFO] 
[INFO] Building Apache Sling Models Integration Tests 0.0.1-SNAPSHOT
[INFO] 
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.models.impl/1.3.5-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.models.impl/1.3.5-SNAPSHOT/maven-metadata.xml
 (1008 B at 2.0 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.models.impl/1.3.5-SNAPSHOT/org.apache.sling.models.impl-1.3.5-20161201.211705-4.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.models.impl/1.3.5-SNAPSHOT/org.apache.sling.models.impl-1.3.5-20161201.211705-4.pom
 (7 KB at 17.2 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.models.jacksonexporter/1.0.5-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.models.jacksonexporter/1.0.5-SNAPSHOT/maven-metadata.xml
 (1019 B at 2.7 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.models.impl/1.3.5-SNAPSHOT/org.apache.sling.models.impl-1.3.5-20161201.211705-4.jar
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.models.impl/1.3.5-SNAPSHOT/org.apache.sling.models.impl-1.3.5-20161201.211705-4.jar
 (343 KB at 458.8 KB/sec)
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
org.apache.sling.models.integration-tests ---
[INFO] Deleting 

[INFO] Deleting 

 (includes = [sling/**], excludes = [])
[INFO] 
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (enforce-java) @ 
org.apache.sling.models.integration-tests ---
[INFO] 
[INFO] --- maven-antrun-plugin:1.8:run 
(set-bundle-required-execution-environment) @ 
org.apache.sling.models.integration-tests ---
[INFO] Executing tasks

main:
[INFO] Executed tasks
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ 
org.apache.sling.models.integration-tests ---
[INFO] 
[INFO] --- maven-resources-plugin:2.7:resources (default-resources) @ 
org.apache.sling.models.integration-tests ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-antrun-plugin:1.8:run (check-memory-task) @ 
org.apache.sling.models.integration-tests ---
[INFO] Executing tasks

main:
 [echo]  WARNING (SLING-443/SLING-1782) 
**
 [echo] On most platforms, you'll get OutOfMemoryErrors when building 
unless you set
 [echo] on

Build failed in Jenkins: sling-launchpad-builder-1.8 #327

2016-12-01 Thread Apache Jenkins Server 
See 

--
Started by upstream project "sling-bundles-scripting-api-1.7" build number 12
originally caused by:
 Started by an SCM change
Started by upstream project 
"sling-bundles-scripting-sightly-js-use-provider-1.7" build number 15
originally caused by:
 Started by upstream project "sling-bundles-scripting-api-1.7" build number 12
 originally caused by:
  Started by an SCM change
Started by upstream project "sling-bundles-scripting-core-1.7" build number 22
originally caused by:
 Started by upstream project "sling-bundles-scripting-api-1.7" build number 12
 originally caused by:
  Started by an SCM change
Started by upstream project "sling-bundles-scripting-sightly-engine-1.7" build 
number 23
originally caused by:
 Started by upstream project "sling-bundles-scripting-api-1.7" build number 12
 originally caused by:
  Started by an SCM change
Started by upstream project "sling-bundles-extensions-models-impl-1.7" build 
number 14
originally caused by:
 Started by an SCM change
Started by upstream project 
"sling-bundles-scripting-sightly-testing-content-1.7" build number 16
originally caused by:
 Started by upstream project "sling-bundles-scripting-sightly-engine-1.7" build 
number 23
 originally caused by:
  Started by upstream project "sling-bundles-scripting-api-1.7" build number 12
  originally caused by:
   Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu-eu2 (ubuntu) in workspace 

Updating https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder at 
revision '2016-12-01T21:33:06.365 +'
U src/main/provisioning/sling.txt
At revision 1772279

No changes for https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder 
since the previous build
Parsing POMs
Established TCP socket on 37198
maven32-agent.jar already up to date
maven32-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[sling-launchpad-builder-1.8] $ /home/jenkins/tools/java/latest1.8/bin/java 
-Xmx2g -Xms256m -XX:MaxPermSize=512m -cp 
/home/jenkins/jenkins-slave/maven32-agent.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/boot/plexus-classworlds-2.5.2.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/conf/logging
 jenkins.maven3.agent.Maven32Main /home/jenkins/tools/maven/apache-maven-3.3.9 
/home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven32-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 37198
Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=512m; 
support was removed in 8.0
<===[JENKINS REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 
-Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 -U clean 
deploy
[INFO] Scanning for projects...
[INFO] 
[INFO] 
[INFO] Building Apache Sling Launchpad Application Builder 9-SNAPSHOT
[INFO] 
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.log/5.0.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.log/5.0.1-SNAPSHOT/maven-metadata.xml
 (1008 B at 2.1 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.core/3.8.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.core/3.8.1-SNAPSHOT/maven-metadata.xml
 (1011 B at 2.6 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT/maven-metadata.xml
 (1015 B at 2.6 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT/org.apache.sling.jcr.oak.server-1.1.3-20161201.121459-34.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT/org.apache.sling.jcr.oak.server-1.1.3-20161201.121459-34.pom
 (10 KB at 25.2 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.provisioning.model/1.7.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.provisioning.model/1.7.1-SNAPSHOT/maven-metadata.xml
 (1015 B at 2.6 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snaps

svn commit: r1772282 - in /sling/trunk/contrib/extensions/contextaware-config/spi/src: main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java test/java/org/apache/sling/caconfig/spi/me

2016-12-01 Thread sseifert 
Author: sseifert
Date: Thu Dec  1 22:39:47 2016
New Revision: 1772282

URL: http://svn.apache.org/viewvc?rev=1772282&view=rev
Log:
SLING-6338 make primitive wrapper type conversion consistent

Modified:

sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java

sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java

Modified: 
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java?rev=1772282&r1=1772281&r2=1772282&view=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java
 Thu Dec  1 22:39:47 2016
@@ -79,10 +79,34 @@ public final class PropertyMetadata e
 }
 
 private static Class typeToPrimitive(Class clazz) {
-if (clazz != String.class && !clazz.isPrimitive()) {
-Class type = ClassUtils.wrapperToPrimitive(clazz);
-if (type != null) {
-return type;
+if (clazz.isArray()) {
+if (ClassUtils.isPrimitiveWrapper(clazz.getComponentType())) {
+if (clazz == Integer[].class) {
+return int[].class;
+}
+if (clazz == Long[].class) {
+return long[].class;
+}
+if (clazz == Double[].class) {
+return double[].class;
+}
+if (clazz == Boolean[].class) {
+return boolean[].class;
+}
+}
+}
+else if (ClassUtils.isPrimitiveWrapper(clazz)) {
+if (clazz == Integer.class) {
+return int.class;
+}
+if (clazz == Long.class) {
+return long.class;
+}
+if (clazz == Double.class) {
+return double.class;
+}
+if (clazz == Boolean.class) {
+return boolean.class;
 }
 }
 return clazz;

Modified: 
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java?rev=1772282&r1=1772281&r2=1772282&view=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java
 Thu Dec  1 22:39:47 2016
@@ -66,6 +66,18 @@ public class PropertyMetadataTest {
 }
 
 @Test
+public void testAllowedTypesConverted() {
+assertEquals(int.class, new PropertyMetadata<>("name1", 
Integer.class).getType());
+assertEquals(int[].class, new PropertyMetadata<>("name1", 
Integer[].class).getType());
+assertEquals(long.class, new PropertyMetadata<>("name1", 
Long.class).getType());
+assertEquals(long[].class, new PropertyMetadata<>("name1", 
Long[].class).getType());
+assertEquals(double.class, new PropertyMetadata<>("name1", 
Double.class).getType());
+assertEquals(double[].class, new PropertyMetadata<>("name1", 
Double[].class).getType());
+assertEquals(boolean.class, new PropertyMetadata<>("name1", 
Boolean.class).getType());
+assertEquals(boolean[].class, new PropertyMetadata<>("name1", 
Boolean[].class).getType());
+}
+
+@Test
 public void testNestedConfiguration() {
 new PropertyMetadata<>("name1", ConfigurationMetadata.class);
 new PropertyMetadata<>("name1", ConfigurationMetadata[].class);

Jenkins build is still unstable: sling-contrib-extensions-contextaware-config-integration-tests-1.8 #230

2016-12-01 Thread Apache Jenkins Server 
See

svn commit: r1772292 - /sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextImpl.java

2016-12-01 Thread justin 
Author: justin
Date: Thu Dec  1 23:47:36 2016
New Revision: 1772292

URL: http://svn.apache.org/viewvc?rev=1772292&view=rev
Log:
SLING-6355 - explicltly defining service interface

Modified:

sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextImpl.java

Modified: 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextImpl.java?rev=1772292&r1=1772291&r2=1772292&view=diff
==
--- 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextImpl.java
 (original)
+++ 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextImpl.java
 Thu Dec  1 23:47:36 2016
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
 
 /** Our default {@link BindingsValuesProvidersByContext} implementation */
 @Component
-@Service
+@Service(BindingsValuesProvidersByContext.class)
 public class BindingsValuesProvidersByContextImpl implements 
BindingsValuesProvidersByContext, ServiceTrackerCustomizer {
 
 private final Map customizers = new 
HashMap();

Build failed in Jenkins: sling-launchpad-builder-1.8 #328

2016-12-01 Thread Apache Jenkins Server 
See 

--
Started by upstream project "sling-bundles-scripting-core-1.7" build number 23
originally caused by:
 Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on H12 (ubuntu) in workspace 

Updating https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder at 
revision '2016-12-02T00:00:50.872 +'
At revision 1772292

WARNING: clock of the subversion server appears to be out of sync. This can 
result in inconsistent check out behavior.
No changes for https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder 
since the previous build
Parsing POMs
Established TCP socket on 43298
maven32-agent.jar already up to date
maven32-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[sling-launchpad-builder-1.8] $ /home/jenkins/tools/java/latest1.8/bin/java 
-Xmx2g -Xms256m -XX:MaxPermSize=512m -cp 
/home/jenkins/jenkins-slave/maven32-agent.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/boot/plexus-classworlds-2.5.2.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/conf/logging
 jenkins.maven3.agent.Maven32Main /home/jenkins/tools/maven/apache-maven-3.3.9 
/home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven32-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 43298
Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=512m; 
support was removed in 8.0
<===[JENKINS REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 
-Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 -U clean 
deploy
[INFO] Scanning for projects...
[INFO] 
[INFO] 
[INFO] Building Apache Sling Launchpad Application Builder 9-SNAPSHOT
[INFO] 
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.log/5.0.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.log/5.0.1-SNAPSHOT/maven-metadata.xml
 (1008 B at 2.2 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.core/3.8.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.core/3.8.1-SNAPSHOT/maven-metadata.xml
 (1011 B at 2.7 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT/maven-metadata.xml
 (1015 B at 2.7 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT/org.apache.sling.jcr.oak.server-1.1.3-20161201.121459-34.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT/org.apache.sling.jcr.oak.server-1.1.3-20161201.121459-34.pom
 (10 KB at 26.3 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.provisioning.model/1.7.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.provisioning.model/1.7.1-SNAPSHOT/maven-metadata.xml
 (1015 B at 2.7 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.api/2.16.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.api/2.16.1-SNAPSHOT/maven-metadata.xml
 (1004 B at 2.7 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.fsclassloader/1.0.3-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.fsclassloader/1.0.3-SNAPSHOT/maven-metadata.xml
 (2 KB at 2.7 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.fsresource/1.1.5-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.fsresource/1.1.5-SNAPSHOT/maven-metadata.xml
 (1019 B at 2.8 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.console/1.0.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.installer.console/1.0.1-SNAPSHOT/maven-metadata.xml
 (2 K

svn commit: r1772306 - in /sling/trunk/contrib/extensions/contextaware-config/impl/src: main/java/org/apache/sling/caconfig/management/impl/ test/java/org/apache/sling/caconfig/management/impl/

2016-12-01 Thread sseifert 
Author: sseifert
Date: Fri Dec  2 06:46:10 2016
New Revision: 1772306

URL: http://svn.apache.org/viewvc?rev=1772306&view=rev
Log:
SLING-6347 filter out internal properties in configuration collection data

Added:

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/PropertiesFilter.java
   (with props)
Modified:

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java

sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImplTest.java

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java?rev=1772306&r1=1772305&r2=1772306&view=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java
 Fri Dec  2 06:46:10 2016
@@ -19,6 +19,7 @@
 package org.apache.sling.caconfig.management.impl;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.sling.caconfig.management.ConfigurationCollectionData;
@@ -30,6 +31,7 @@ final class ConfigurationCollectionDataI
 private final Collection items;
 private final String resourcePath;
 private final Map properties;
+private Map filteredPropertiesCache;
 
 public ConfigurationCollectionDataImpl(String configName, 
Collection items,
 String resourcePath, Map properties) {
@@ -56,7 +58,11 @@ final class ConfigurationCollectionDataI
 
 @Override
 public Map getProperties() {
-return properties;
+if (filteredPropertiesCache == null) {
+filteredPropertiesCache = new HashMap<>(properties);
+PropertiesFilter.removeIgnoredProperties(filteredPropertiesCache);
+}
+return filteredPropertiesCache;
 }
 
 }

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java?rev=1772306&r1=1772305&r2=1772306&view=diff
==
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
 Fri Dec  2 06:46:10 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.sling.caconfig.management.impl;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,9 +58,6 @@ final class ConfigurationDataImpl implem
 private ValueMap valuesCache;
 private ValueMap effectiveValuesCache;
 
-private static final Set PROPERTIES_TO_IGNORE = new 
HashSet<>(Arrays.asList(
-"jcr:primaryType"));
-
 @SuppressWarnings("unchecked")
 public ConfigurationDataImpl(ConfigurationMetadata configMetadata,
 Resource resolvedConfigurationResource, Resource 
writebackConfigurationResource,
@@ -127,7 +123,7 @@ final class ConfigurationDataImpl implem
 if (resolvedConfigurationResource != null) {
 
propertyNamesCache.addAll(ResourceUtil.getValueMap(resolvedConfigurationResource).keySet());
 }
-removeIgnoredProperties(propertyNamesCache);
+PropertiesFilter.removeIgnoredProperties(propertyNamesCache);
 }
 return propertyNamesCache;
 }
@@ -139,7 +135,7 @@ final class ConfigurationDataImpl implem
 if (writebackConfigurationResource != null) {
 props.putAll( 
ResourceUtil.getValueMap(writebackConfigurationResource));
 }
-removeIgnoredProperties(props);
+PropertiesFilter.removeIgnoredProperties(props);
 resolveNestedConfigs(props);
 valuesCache = new ValueMapDecorator(props);
 }
@@ -160,23 +156,13 @@ final class ConfigurationDataImpl implem

Jenkins build is still unstable: sling-contrib-extensions-contextaware-config-integration-tests-1.8 #231

2016-12-01 Thread Apache Jenkins Server 
See