sling-org-apache-sling-resourcemerger.git
2 months agotrivial: added license header to *.md files master
Radu Cotescu [Thu, 20 Sep 2018 09:09:07 +0000 (11:09 +0200)] 
trivial: added license header to *.md files

2 months agoSLING-7215 - [nice-to-have] Add a CONTRIBUTING file to every module
Radu Cotescu [Wed, 19 Sep 2018 16:29:20 +0000 (18:29 +0200)] 
SLING-7215 - [nice-to-have] Add a CONTRIBUTING file to every module

2 months agoSLING-7216 - [nice-to-have] Add a CODE_OF_CONDUCT file to every module
Radu Cotescu [Wed, 19 Sep 2018 16:04:03 +0000 (18:04 +0200)] 
SLING-7216 - [nice-to-have] Add a CODE_OF_CONDUCT file to every module

6 months agoUpdating badges for org-apache-sling-resourcemerger
Dan Klco [Fri, 8 Jun 2018 19:42:31 +0000 (15:42 -0400)] 
Updating badges for org-apache-sling-resourcemerger

10 months ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Wed, 17 Jan 2018 15:40:58 +0000 (16:40 +0100)] 
[maven-release-plugin] prepare for next development iteration

10 months ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.8 org.apache.sling.resourcemerger-1.3.8
Carsten Ziegeler [Wed, 17 Jan 2018 15:40:40 +0000 (16:40 +0100)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.8

11 months agoMerge pull request #2 from rishi05091989/master
Carsten Ziegeler [Fri, 12 Jan 2018 13:02:26 +0000 (14:02 +0100)] 
Merge pull request #2 from rishi05091989/master

SLING-7375 Moving order using overlapping children causing IndexOutOf…

11 months agoSLING-7375 Moving order using overlapping children causing IndexOutOfBoundException 2/head
Rishi Mehta [Fri, 12 Jan 2018 11:57:43 +0000 (17:27 +0530)] 
SLING-7375 Moving order using overlapping children causing IndexOutOfBoundException

11 months ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Wed, 10 Jan 2018 09:52:48 +0000 (10:52 +0100)] 
[maven-release-plugin] prepare for next development iteration

11 months ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.6 org.apache.sling.resourcemerger-1.3.6
Carsten Ziegeler [Wed, 10 Jan 2018 09:52:30 +0000 (10:52 +0100)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.6

11 months agoMerge pull request #1 from rishi05091989/master
Carsten Ziegeler [Wed, 10 Jan 2018 09:50:28 +0000 (10:50 +0100)] 
Merge pull request #1 from rishi05091989/master

SLING-7366 OrderBefore property not being honored during resource mer…

11 months agoSLING-7366 OrderBefore property not being honored during resource merging 1/head
Rishi Mehta [Mon, 8 Jan 2018 16:23:51 +0000 (21:53 +0530)] 
SLING-7366 OrderBefore property not being honored during resource merging

13 months agoSLING-7213 - Add a default .gitignore file to every module
Robert Munteanu [Tue, 24 Oct 2017 11:41:01 +0000 (13:41 +0200)] 
SLING-7213 - Add a default .gitignore file to every module

13 months agoSLING-7214 - Add the LICENSE file to every module
Robert Munteanu [Mon, 23 Oct 2017 16:38:24 +0000 (18:38 +0200)] 
SLING-7214 - Add the LICENSE file to every module

13 months agoFix typo in pom.xml : conncetion should be connection
Robert Munteanu [Mon, 23 Oct 2017 09:06:30 +0000 (12:06 +0300)] 
Fix typo in pom.xml : conncetion should be connection

13 months agoSLING-7162 - Update SCM information in all POM files to reference Git
Robert Munteanu [Fri, 20 Oct 2017 17:13:16 +0000 (19:13 +0200)] 
SLING-7162 - Update SCM information in all POM files to reference Git

14 months agoSLING-7167 Adjust READMEs
Oliver Lietz [Tue, 3 Oct 2017 09:30:06 +0000 (09:30 +0000)] 
SLING-7167 Adjust READMEs

add missing README

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810743 13f79535-47bb-0310-9956-ffa450edef68

17 months agoclarify naming of overlay vs. override pickers
Konrad Windszus [Thu, 22 Jun 2017 12:34:00 +0000 (12:34 +0000)] 
clarify naming of overlay vs. override pickers

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1799574 13f79535-47bb-0310-9956-ffa450edef68

17 months agoclarify relatedResource in Javadoc
Konrad Windszus [Thu, 22 Jun 2017 12:25:29 +0000 (12:25 +0000)] 
clarify relatedResource in Javadoc

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1799573 13f79535-47bb-0310-9956-ffa450edef68

17 months ago[maven-release-plugin] prepare for next development iteration
Konrad Windszus [Fri, 16 Jun 2017 13:57:17 +0000 (13:57 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1798931 13f79535-47bb-0310-9956-ffa450edef68

17 months ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.4
Konrad Windszus [Fri, 16 Jun 2017 13:57:02 +0000 (13:57 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.4

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1798929 13f79535-47bb-0310-9956-ffa450edef68

17 months agoremove redundant test method
Konrad Windszus [Fri, 16 Jun 2017 13:55:02 +0000 (13:55 +0000)] 
remove redundant test method

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1798928 13f79535-47bb-0310-9956-ffa450edef68

17 months agoSLING-6956 do not touch order when no new resources have been defined in an overlying...
Konrad Windszus [Fri, 16 Jun 2017 13:42:53 +0000 (13:42 +0000)] 
SLING-6956 do not touch order when no new resources have been defined in an overlying resource

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1798927 13f79535-47bb-0310-9956-ffa450edef68

18 months agoSLING-6951 correctly hide underlying grand children (which are hidden by the grandpar...
Konrad Windszus [Tue, 13 Jun 2017 12:46:32 +0000 (12:46 +0000)] 
SLING-6951 correctly hide underlying grand children (which are hidden by the grandparent's sling:hideChildren)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1798594 13f79535-47bb-0310-9956-ffa450edef68

18 months agoSLING-6951 do not hide local grandchildren when sling:hideChildren is set on the...
Konrad Windszus [Tue, 13 Jun 2017 11:36:26 +0000 (11:36 +0000)] 
SLING-6951 do not hide local grandchildren when sling:hideChildren is set on the grandparent

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1798579 13f79535-47bb-0310-9956-ffa450edef68

21 months agoSLING-6587 improved javadoc
Georg Henzler [Thu, 2 Mar 2017 15:00:01 +0000 (15:00 +0000)] 
SLING-6587 improved javadoc

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785149 13f79535-47bb-0310-9956-ffa450edef68

22 months ago[maven-release-plugin] prepare for next development iteration
Konrad Windszus [Sun, 5 Feb 2017 11:08:37 +0000 (11:08 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1781730 13f79535-47bb-0310-9956-ffa450edef68

22 months ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.2
Konrad Windszus [Sun, 5 Feb 2017 11:08:22 +0000 (11:08 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.2

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1781728 13f79535-47bb-0310-9956-ffa450edef68

22 months agofix some javadoc
Konrad Windszus [Sun, 5 Feb 2017 09:04:06 +0000 (09:04 +0000)] 
fix some javadoc

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1781725 13f79535-47bb-0310-9956-ffa450edef68

23 months agoSLING-6457 correctly expose child resources in MergedResource's toString()
Konrad Windszus [Fri, 13 Jan 2017 12:57:19 +0000 (12:57 +0000)] 
SLING-6457 correctly expose child resources in MergedResource's toString()

by printing out all entries of the string array.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1778578 13f79535-47bb-0310-9956-ffa450edef68

23 months agoupdate to latest version of sling hamcrest
Stefan Seifert [Sat, 7 Jan 2017 12:43:08 +0000 (12:43 +0000)] 
update to latest version of sling hamcrest

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1777773 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6117 remove "with"/"has" prefix from ResourceMatchers method names as well
Stefan Seifert [Mon, 10 Oct 2016 20:59:09 +0000 (20:59 +0000)] 
SLING-6117 remove "with"/"has" prefix from ResourceMatchers method names as well
add "path" to resource collection/iterator matchers

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1764180 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6117 Hamcrest: Simplify ResourceMatchers method signatures
Stefan Seifert [Sat, 8 Oct 2016 08:09:18 +0000 (08:09 +0000)] 
SLING-6117 Hamcrest: Simplify ResourceMatchers method signatures

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1763865 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-4915 remove irrelevant code
Konrad Windszus [Fri, 12 Feb 2016 11:00:32 +0000 (11:00 +0000)] 
SLING-4915 remove irrelevant code

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729983 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-4915 preferably take the order from the overlying resource
Konrad Windszus [Fri, 12 Feb 2016 10:57:38 +0000 (10:57 +0000)] 
SLING-4915 preferably take the order from the overlying resource

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729981 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLNG-5468, make wildcards in sling:hideProperties and sling:hideChildren only act...
Konrad Windszus [Fri, 12 Feb 2016 09:45:19 +0000 (09:45 +0000)] 
SLNG-5468, make wildcards in sling:hideProperties and sling:hideChildren only act on inherited children/properties (not on the local ones) to allow to easily replace an existing resource

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729965 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Wed, 10 Feb 2016 15:04:40 +0000 (15:04 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729621 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.0
Carsten Ziegeler [Wed, 10 Feb 2016 15:04:20 +0000 (15:04 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729618 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-5502 : Additions to MergedResourcePicker break existing implementations
Carsten Ziegeler [Wed, 10 Feb 2016 12:42:17 +0000 (12:42 +0000)] 
SLING-5502 : Additions to MergedResourcePicker break existing implementations

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729589 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-5502 : Additions to MergedResourcePicker break existing implementations
Carsten Ziegeler [Wed, 10 Feb 2016 09:51:00 +0000 (09:51 +0000)] 
SLING-5502 : Additions to MergedResourcePicker break existing implementations

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729566 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-5501 : Adjust resource merger for latest API changes. Apply patch from Joel...
Carsten Ziegeler [Tue, 9 Feb 2016 17:34:52 +0000 (17:34 +0000)] 
SLING-5501 : Adjust resource merger for latest API changes. Apply patch from Joel Richard

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729420 13f79535-47bb-0310-9956-ffa450edef68

2 years agoupdate to released versions
Stefan Seifert [Mon, 8 Feb 2016 23:13:03 +0000 (23:13 +0000)] 
update to released versions

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729289 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSwitch to parent pom 26
Carsten Ziegeler [Sun, 3 Jan 2016 14:07:46 +0000 (14:07 +0000)] 
Switch to parent pom 26

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68

3 years agoCopy relevant bits of resourceresolver private impl class to resourcemerger to avoid...
Carsten Ziegeler [Wed, 28 Oct 2015 17:41:12 +0000 (17:41 +0000)] 
Copy relevant bits of resourceresolver private impl class to resourcemerger to avoid dependency on internal classes (even if it's for testing)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1711081 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5204 : Implement provider lifecycle methods
Carsten Ziegeler [Wed, 28 Oct 2015 17:13:19 +0000 (17:13 +0000)] 
SLING-5204 : Implement provider lifecycle methods

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1711069 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5201 : Improve resource provider resolving
Carsten Ziegeler [Tue, 27 Oct 2015 13:48:27 +0000 (13:48 +0000)] 
SLING-5201 : Improve resource provider resolving

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1710817 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4611 Performance: Consider optimizing MergedResource#getParent and getChild
Tomasz Rekawek [Thu, 22 Oct 2015 12:40:37 +0000 (12:40 +0000)] 
SLING-4611 Performance: Consider optimizing MergedResource#getParent and getChild

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1710006 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5108 Reverted MergedResource#toString() change
Tomasz Rekawek [Thu, 8 Oct 2015 15:12:31 +0000 (15:12 +0000)] 
SLING-5108 Reverted MergedResource#toString() change

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1707565 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5108 Various little performance improvements
Tomasz Rekawek [Thu, 8 Oct 2015 09:41:07 +0000 (09:41 +0000)] 
SLING-5108 Various little performance improvements

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1707465 13f79535-47bb-0310-9956-ffa450edef68

3 years agoUpdate the contrib reactor to parent 25
Robert Munteanu [Mon, 5 Oct 2015 10:04:15 +0000 (10:04 +0000)] 
Update the contrib reactor to parent 25

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706781 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Radu Cotescu [Wed, 15 Jul 2015 09:51:27 +0000 (09:51 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1691158 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.10
Radu Cotescu [Wed, 15 Jul 2015 09:51:12 +0000 (09:51 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.10

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1691156 13f79535-47bb-0310-9956-ffa450edef68

3 years agotrivial: updated JavaDoc to comply with Java 1.8
Radu Cotescu [Wed, 15 Jul 2015 09:49:39 +0000 (09:49 +0000)] 
trivial: updated JavaDoc to comply with Java 1.8

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1691152 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4878 - Resource Merger: Infinite loop in case a parent resource has one of...
Radu Cotescu [Wed, 15 Jul 2015 08:30:34 +0000 (08:30 +0000)] 
SLING-4878 - Resource Merger: Infinite loop in case a parent resource has one of its children as a supertype

* fixed infinite loop if an inheritance loop exists
(applied patch from Vlad Bailescu)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1691143 13f79535-47bb-0310-9956-ffa450edef68

3 years agoset parent version to 24 and add empty relativePath where missing
Oliver Lietz [Tue, 7 Jul 2015 07:36:29 +0000 (07:36 +0000)] 
set parent version to 24 and add empty relativePath where missing

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689588 13f79535-47bb-0310-9956-ffa450edef68

3 years agoUpdate contrib modules to Parent 23
Robert Munteanu [Thu, 25 Jun 2015 13:10:59 +0000 (13:10 +0000)] 
Update contrib modules to Parent 23

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687503 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4568 : Performance: MergingResourceProvider.ParentHidingHandler adds about...
Carsten Ziegeler [Mon, 27 Apr 2015 11:39:24 +0000 (11:39 +0000)] 
SLING-4568 : Performance: MergingResourceProvider.ParentHidingHandler adds about 30pp rendering overhead. Apply slightly modified patch from Joel Richard

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676240 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4568 : Performance: MergingResourceProvider.ParentHidingHandler adds about...
Carsten Ziegeler [Mon, 27 Apr 2015 11:23:03 +0000 (11:23 +0000)] 
SLING-4568 : Performance: MergingResourceProvider.ParentHidingHandler adds about 30pp rendering overhead. Apply slightly modified patch from Joel Richard

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676239 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4653 : [Regression] Merging resource provider is traversing parent hierarchy...
Carsten Ziegeler [Thu, 23 Apr 2015 15:26:28 +0000 (15:26 +0000)] 
SLING-4653 : [Regression] Merging resource provider is traversing parent hierarchy for finding hide properties

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1675623 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4568 : Performance: MergingResourceProvider.ParentHidingHandler adds about...
Carsten Ziegeler [Thu, 23 Apr 2015 09:10:27 +0000 (09:10 +0000)] 
SLING-4568 : Performance: MergingResourceProvider.ParentHidingHandler adds about 30pp rendering overhead. Apply partial patch from Joel Richard

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1675563 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Mon, 9 Mar 2015 08:34:00 +0000 (08:34 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1665153 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.8
Carsten Ziegeler [Mon, 9 Mar 2015 08:33:48 +0000 (08:33 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.8

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1665151 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4468 - fixing case where parent is missing but grandparent is available
Justin Edelson [Mon, 2 Mar 2015 15:35:44 +0000 (15:35 +0000)] 
SLING-4468 - fixing case where parent is missing but grandparent is available

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1663332 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Thu, 12 Feb 2015 02:17:43 +0000 (02:17 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1659131 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.6
Carsten Ziegeler [Thu, 12 Feb 2015 02:17:30 +0000 (02:17 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.6

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1659129 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4398 : Potential NPE when non existing resource has no parent
Carsten Ziegeler [Tue, 10 Feb 2015 13:10:15 +0000 (13:10 +0000)] 
SLING-4398 : Potential NPE when non existing resource has no parent

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1658706 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Wed, 4 Feb 2015 12:44:38 +0000 (12:44 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1657172 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.4
Carsten Ziegeler [Wed, 4 Feb 2015 12:44:24 +0000 (12:44 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.4

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1657170 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4340 : SLING-4247 created odd side-effects
Carsten Ziegeler [Thu, 29 Jan 2015 08:01:43 +0000 (08:01 +0000)] 
SLING-4340 : SLING-4247 created odd side-effects

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1655545 13f79535-47bb-0310-9956-ffa450edef68

3 years agoRemove wrong break statement again
Carsten Ziegeler [Wed, 28 Jan 2015 09:46:11 +0000 (09:46 +0000)] 
Remove wrong break statement again

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1655252 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4247 : clean up code and add missing break
Carsten Ziegeler [Mon, 26 Jan 2015 14:40:00 +0000 (14:40 +0000)] 
SLING-4247 : clean up code and add missing break

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1654818 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4247 : clean up code and add missing break
Carsten Ziegeler [Mon, 26 Jan 2015 14:03:33 +0000 (14:03 +0000)] 
SLING-4247 : clean up code and add missing break

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1654805 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4340 - getting the resource type property *first* and then falling back to...
Justin Edelson [Wed, 21 Jan 2015 17:05:14 +0000 (17:05 +0000)] 
SLING-4340 - getting the resource type property *first* and then falling back to the first non-null getResourceType() result.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1653604 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4311 - edge case where reusing an hidden ancestor name caused the wrong resourc...
Justin Edelson [Mon, 19 Jan 2015 22:38:04 +0000 (22:38 +0000)] 
SLING-4311 - edge case where reusing an hidden ancestor name caused the wrong resource to be hidden

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1653144 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4311 - edge case where reusing an hidden ancestor name caused the wrong resourc...
Justin Edelson [Mon, 19 Jan 2015 22:28:47 +0000 (22:28 +0000)] 
SLING-4311 - edge case where reusing an hidden ancestor name caused the wrong resource to be hidden

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1653137 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Sat, 17 Jan 2015 10:45:51 +0000 (10:45 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1652578 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.2
Carsten Ziegeler [Sat, 17 Jan 2015 10:45:35 +0000 (10:45 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.2

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1652576 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4311 - have the overriding resource picker create stub (non-existing) resources...
Justin Edelson [Wed, 14 Jan 2015 22:36:57 +0000 (22:36 +0000)] 
SLING-4311 - have the overriding resource picker create stub (non-existing) resources to accommodate for missing hierarchy nodes.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1651858 13f79535-47bb-0310-9956-ffa450edef68

3 years agoAdd a new test case
Carsten Ziegeler [Tue, 13 Jan 2015 15:42:06 +0000 (15:42 +0000)] 
Add a new test case

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1651385 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4247 : Reconsider resource type handling
Carsten Ziegeler [Tue, 6 Jan 2015 15:41:24 +0000 (15:41 +0000)] 
SLING-4247 : Reconsider resource type handling

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1649839 13f79535-47bb-0310-9956-ffa450edef68

4 years ago[maven-release-plugin] prepare for next development iteration
Justin Edelson [Mon, 24 Nov 2014 22:18:57 +0000 (22:18 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1641498 13f79535-47bb-0310-9956-ffa450edef68

4 years ago[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.0
Justin Edelson [Mon, 24 Nov 2014 22:18:53 +0000 (22:18 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1641496 13f79535-47bb-0310-9956-ffa450edef68

4 years agoUpdate to Sling Parent POM 22 with baselining enabled
Carsten Ziegeler [Wed, 1 Oct 2014 06:52:29 +0000 (06:52 +0000)] 
Update to Sling Parent POM 22 with baselining enabled

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628620 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3909 : Merged ResourceProviders should be optionally modifiable
Carsten Ziegeler [Tue, 23 Sep 2014 02:45:33 +0000 (02:45 +0000)] 
SLING-3909 : Merged ResourceProviders should be optionally modifiable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1626931 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3909 : Merged ResourceProviders should be optionally modifiable
Carsten Ziegeler [Tue, 23 Sep 2014 02:42:50 +0000 (02:42 +0000)] 
SLING-3909 : Merged ResourceProviders should be optionally modifiable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1626930 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3927 : Cleanup / deprecate ResourceMergerService
Carsten Ziegeler [Tue, 23 Sep 2014 02:39:47 +0000 (02:39 +0000)] 
SLING-3927 : Cleanup / deprecate ResourceMergerService

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1626928 13f79535-47bb-0310-9956-ffa450edef68

4 years agoCorrect delete behaviour
Carsten Ziegeler [Thu, 18 Sep 2014 12:19:21 +0000 (12:19 +0000)] 
Correct delete behaviour

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1625959 13f79535-47bb-0310-9956-ffa450edef68

4 years agoUse a better pid as this is actually public api
Carsten Ziegeler [Tue, 16 Sep 2014 13:52:15 +0000 (13:52 +0000)] 
Use a better pid as this is actually public api

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1625286 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3909 : Merged ResourceProviders should be optionally modifiable
Carsten Ziegeler [Tue, 16 Sep 2014 13:50:22 +0000 (13:50 +0000)] 
SLING-3909 : Merged ResourceProviders should be optionally modifiable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1625285 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3423/SLING-3657 : Change return type of picker interface from iterator to List
Carsten Ziegeler [Mon, 15 Sep 2014 13:23:32 +0000 (13:23 +0000)] 
SLING-3423/SLING-3657 : Change return type of picker interface from iterator to List

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1625029 13f79535-47bb-0310-9956-ffa450edef68

4 years agoRefactoring - put pickers into separate package, align name of CRUD implementation
Carsten Ziegeler [Sat, 13 Sep 2014 15:38:56 +0000 (15:38 +0000)] 
Refactoring - put pickers into separate package, align name of CRUD implementation

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1624754 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3909 : Merged ResourceProviders should be optionally modifiable
Carsten Ziegeler [Sat, 13 Sep 2014 13:35:37 +0000 (13:35 +0000)] 
SLING-3909 : Merged ResourceProviders should be optionally modifiable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1624735 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3909 : Merged ResourceProviders should be optionally modifiable
Carsten Ziegeler [Sat, 13 Sep 2014 13:08:08 +0000 (13:08 +0000)] 
SLING-3909 : Merged ResourceProviders should be optionally modifiable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1624734 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3657 - requiring configuration to avoid excess registration
Justin Edelson [Thu, 4 Sep 2014 17:32:06 +0000 (17:32 +0000)] 
SLING-3657 - requiring configuration to avoid excess registration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622515 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3657 - adding metatype
Justin Edelson [Thu, 4 Sep 2014 15:54:53 +0000 (15:54 +0000)] 
SLING-3657 - adding metatype

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622505 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3423 - ResourceMergerService API must allow custom merge paths
Carsten Ziegeler [Thu, 4 Sep 2014 08:43:48 +0000 (08:43 +0000)] 
SLING-3423 - ResourceMergerService API must allow custom merge paths

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622419 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3423 / SLING-3657 - adding MergedResourcePicker for implementing additional...
Justin Edelson [Thu, 4 Sep 2014 01:37:48 +0000 (01:37 +0000)] 
SLING-3423 / SLING-3657 - adding MergedResourcePicker for implementing additional merged resource selection algorithms. Implmeneting OverridingResourcePicker to provide /mnt/override which merges resources based on the resource type hierarchy

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622390 13f79535-47bb-0310-9956-ffa450edef68

4 years agoUpdate to latest parent pom 20
Carsten Ziegeler [Tue, 2 Sep 2014 14:49:28 +0000 (14:49 +0000)] 
Update to latest parent pom 20

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1622027 13f79535-47bb-0310-9956-ffa450edef68

4 years agoSLING-3521 : Merged resource is not available if parent folder is unreadable
Carsten Ziegeler [Fri, 16 May 2014 08:56:00 +0000 (08:56 +0000)] 
SLING-3521 : Merged resource is not available if parent folder is unreadable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1595142 13f79535-47bb-0310-9956-ffa450edef68

4 years agoUpdate to parent pom v19
Carsten Ziegeler [Mon, 31 Mar 2014 14:39:20 +0000 (14:39 +0000)] 
Update to parent pom v19

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1583337 13f79535-47bb-0310-9956-ffa450edef68