[1/2] sling-site git commit: also ignore IDE generated files (like .project for Eclipse)

[kwin]

Repository: sling-site
Updated Branches:
  refs/heads/master 78c0fcd83 -> 8b39fe9d6


also ignore IDE generated files (like .project for Eclipse)

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

Branch: refs/heads/master
Commit: ad265dcdf6004706868fcf40ad45dd58dde7c16c
Parents: 60e5a88
Author: Konrad Windszus 
Authored: Sat Sep 30 17:34:04 2017 +0200
Committer: Konrad Windszus 
Committed: Sat Sep 30 17:34:04 2017 +0200

--
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/sling-site/blob/ad265dcd/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 12f9706..1a0836c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 output
 cache
 target
+# IDE settings
+.*

[2/2] sling-site git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/sling-site.git

[kwin]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/sling-site.git

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

Branch: refs/heads/master
Commit: 8b39fe9d632607ecef2d74d23ac481b9ca0b938c
Parents: ad265dc 78c0fcd
Author: Konrad Windszus 
Authored: Sat Sep 30 17:34:17 2017 +0200
Committer: Konrad Windszus 
Committed: Sat Sep 30 17:34:17 2017 +0200

--
 README.md   | 30 ++---
 src/main/jbake/assets/res/css/site.css  | 23 ++
 src/main/jbake/content/contributing.md  |  1 +
 src/main/jbake/content/documentation.md |  1 +
 src/main/jbake/content/documentation/bundles.md |  1 +
 ...ilesystem-resources-extensions-fsresource.md |  1 +
 .../bundles/apache-sling-commons-thread-pool.md |  1 +
 .../apache-sling-eventing-and-job-handling.md   |  1 +
 ...undle-resources-extensions-bundleresource.md |  1 +
 .../documentation/bundles/caching-services.md   |  1 +
 .../bundles/commons-html-utilities.md   |  1 +
 .../bundles/configuration-installer-factory.md  |  1 +
 .../bundles/content-distribution.md |  1 +
 .../content-loading-jcr-contentloader.md|  1 +
 ...ware-configuration-default-implementation.md |  1 +
 .../context-aware-configuration-override.md |  1 +
 .../context-aware-configuration-spi.md  |  1 +
 .../context-aware-configuration.md  |  1 +
 .../bundles/datasource-providers.md |  1 +
 .../bundles/discovery-api-and-impl.md   |  1 +
 .../documentation/bundles/dynamic-includes.md   |  1 +
 .../bundles/file-installer-provider.md  |  1 +
 .../internationalization-support-i18n.md|  1 +
 .../bundles/jcr-installer-provider.md   |  1 +
 .../documentation/bundles/log-tracers.md|  1 +
 ...ging-permissions-jackrabbit-accessmanager.md |  1 +
 ...g-users-and-groups-jackrabbit-usermanager.md |  1 +
 ...ontent-the-slingpostservlet-servlets-post.md |  1 +
 .../content/documentation/bundles/metrics.md|  1 +
 .../bundles/mime-type-support-commons-mime.md   |  1 +
 .../content/documentation/bundles/models.md |  1 +
 .../bundles/nosql-resource-providers.md |  1 +
 .../bundles/org-apache-sling-junit-bundles.md   |  1 +
 .../documentation/bundles/osgi-installer.md |  1 +
 ...iting-pipelines-org-apache-sling-rewriter.md |  1 +
 .../rendering-content-default-get-servlets.md   |  1 +
 .../bundles/repository-initialization.md|  3 +-
 .../documentation/bundles/request-analysis.md   |  1 +
 .../bundles/resource-access-security.md |  1 +
 .../documentation/bundles/resource-editor.md|  1 +
 .../documentation/bundles/resource-merger.md|  1 +
 .../scheduler-service-commons-scheduler.md  |  1 +
 .../content/documentation/bundles/scripting.md  |  1 +
 .../bundles/scripting/scripting-htl.md  |  1 +
 .../bundles/scripting/scripting-jsp.md  |  1 +
 .../bundles/scripting/scripting-thymeleaf.md|  1 +
 .../documentation/bundles/servlet-helpers.md|  1 +
 .../bundles/sling-health-check-tool.md  |  1 +
 .../bundles/sling-oak-restrictions.md   |  1 +
 .../documentation/bundles/sling-pipes.md|  1 +
 .../documentation/bundles/sling-query.md|  1 +
 .../bundles/sling-query/basic-ideas.md  |  1 +
 .../bundles/sling-query/examples.md |  1 +
 .../bundles/sling-query/hierarchy-operators.md  |  1 +
 .../bundles/sling-query/methods.md  |  1 +
 .../bundles/sling-query/modifiers.md|  1 +
 .../bundles/sling-query/operators.md|  1 +
 .../bundles/sling-query/selectors.md|  1 +
 .../documentation/bundles/sling-query/vs-jcr.md |  1 +
 .../sling-settings-org-apache-sling-settings.md |  1 +
 .../bundles/subsystem-installer-factory.md  |  1 +
 .../content/documentation/bundles/validation.md |  1 +
 .../bundles/web-console-extensions.md   |  1 +
 .../documentation/bundles/xml-support.md|  1 +
 .../content/documentation/configuration.md  |  1 +
 .../jbake/content/documentation/development.md  |  1 +
 .../development/client-request-logging.md   |  1 +
 .../development/dependency-management.md|  1 +
 .../development/embedding-sling.md  |  1 +
 .../development/getting-and-building-sling.md   | 11 ++---
 .../documentation/development/hamcrest.md   |  1 +
 .../development/htl-maven-plugin.md |  1 +
 .../documentation/development/ide-tooling.md|  1 +
 .../ide-tooling-incremental-build.md|  1 +
 .../documentation/development/issue-tracker.md  |  1 +
 

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/

[sseifert]

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)
+++ 

[1/2] sling-site git commit: Sync website

[cziegeler]

Repository: sling-site
Updated Branches:
  refs/heads/asf-site 19197fc54 -> e2300128b


http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/tags/core.html
--
diff --git a/tags/core.html b/tags/core.html
index daab461..14d8aaa 100644
--- a/tags/core.html
+++ b/tags/core.html
@@ -156,13 +156,8 @@
 webconsole1 
 xml1 
 xslt1 
-Tagged with 'core'Sling API
-Request Processing
+Tagged with 'core'Apache 
Sling Commons Thread Pool
 Apache
 Sling Eventing and Job Handling
-Apache 
Sling Commons Thread Pool
-Integrating Scripting 
Languages
-The Sling Engine
-URL to 
Script Resolution
 Adapters
 Architecture
 Authentication
 - Actors
@@ -184,6 +179,11 @@
 Sling API 
CRUD Support
 Well-known Sling 
Properties
 URL 
decomposition
+URL to 
Script Resolution
+The Sling Engine
+Request Processing
+Integrating Scripting 
Languages
+Sling API
 
 
 

http://git-wip-us.apache.org/repos/asf/sling-site/blob/e2300128/tags/development.html
--
diff --git a/tags/development.html b/tags/development.html
index e91f405..ded1a2e 100644
--- a/tags/development.html
+++ b/tags/development.html
@@ -156,31 +156,31 @@
 webconsole1 
 xml1 
 xslt1 
-Tagged with 
'development'Assembly
-Testing
 Sling-based applications
-Sling Pax Exam Utilities
-Development
-Version Policy
-Maven Sling Plugin
-Sling Testing 
Tools
-Sling Mocks
-Repository 
Based Development
-Release 
Management
-OSGi Mocks
-MavenTipsAndTricks
-Maven Usage
-Maven Launchpad 
Plugin
-Maven 
Archetypes
-Leveraging JSR-305 null 
annotations to prevent NullPointerExceptions
-HTL Maven Plugin
-JCR Mocks
-Issue Tracker
-Sling IDE tooling for 
Eclipse User Guide
-Incremental
 Builds in Sling IDE tooling for Eclipse
-HTL Maven 
Plugin
-Hamcrest Integration
-Getting and 
Building Sling
+Tagged with 
'development'Getting and 
Building Sling
 Dependency 
Management
+Hamcrest Integration
+HTL Maven 
Plugin
+Incremental
 Builds in Sling IDE tooling for Eclipse
+Sling IDE tooling for 
Eclipse User Guide
+Issue Tracker
+JCR Mocks
+HTL Maven Plugin
+Leveraging JSR-305 null 
annotations to prevent NullPointerExceptions
+Maven 
Archetypes
+Maven Launchpad 
Plugin
+Maven Usage
+MavenTipsAndTricks
+OSGi Mocks
+Release 
Management
+Repository 
Based Development
+Sling Mocks
+Sling Testing 
Tools
+Maven Sling Plugin
+Version Policy
+Development
+Sling Pax Exam Utilities
+Testing
 Sling-based applications
+Assembly
 
 
 

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

[sseifert]

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("1", "stringParam", "value1")
+.resource("2", "stringParam", "value2")
+.resource("3",