[sling-org-apache-sling-pipes] 02/04: SLING-7172 add parent(s) pipes

[npeltier]

This is an automated email from the ASF dual-hosted git repository.

npeltier pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git

commit af8e64ef6c7391490a9df483a58dea1e1ae923b3
Author: npeltier 
AuthorDate: Fri Oct 20 21:23:53 2017 +0200

SLING-7172 add parent(s) pipes

- move parent pipe to be a sling query pipe,
- added abstract sling query pipe to avoid duplications,
- added parents pipe,
- added unit tests for both parent and parents pipe
---
 .../java/org/apache/sling/pipes/PipeBuilder.java   |  7 
 .../sling/pipes/internal/PipeBuilderImpl.java  |  8 
 .../apache/sling/pipes/internal/PlumberImpl.java   |  6 ++-
 .../sling/pipes/internal/PlumberServlet.java   |  1 +
 .../AbstractExpressionSlingQueryPipe.java} | 44 +-
 .../AbstractSlingQueryPipe.java}   | 39 ++-
 .../internal/{ => slingQuery}/ChildrenPipe.java| 29 +++---
 .../internal/{ => slingQuery}/ParentPipe.java  | 21 +--
 .../ParentsPipe.java}  | 25 ++--
 .../org/apache/sling/pipes/AbstractPipeTest.java   |  2 +
 .../{ => slingQuery}/ChildrenPipeTest.java |  2 +-
 .../ParentPipeTest.java}   | 29 ++
 .../ParentsPipeTest.java}  | 32 +++-
 .../SLING-INF/jcr_root/content/fruits.json |  1 +
 14 files changed, 111 insertions(+), 135 deletions(-)

diff --git a/src/main/java/org/apache/sling/pipes/PipeBuilder.java 
b/src/main/java/org/apache/sling/pipes/PipeBuilder.java
index 2082f23..3fe25c2 100644
--- a/src/main/java/org/apache/sling/pipes/PipeBuilder.java
+++ b/src/main/java/org/apache/sling/pipes/PipeBuilder.java
@@ -126,6 +126,13 @@ public interface PipeBuilder {
  */
 PipeBuilder parent();
 
+/**
+ * attach a parents pipe to the current context
+ * @param expr expression
+ * @return updated instance of PipeBuilder
+ * @throws IllegalAccessException in case it's called with wrong # of 
arguments
+ */
+PipeBuilder parents(String expr) throws IllegalAccessException;
 
 /**
  * attach a reference pipe to the current context
diff --git a/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java 
b/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
index 15e70f2..85e78e5 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
@@ -23,6 +23,9 @@ import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.event.jobs.Job;
 import org.apache.sling.pipes.*;
+import org.apache.sling.pipes.internal.slingQuery.ChildrenPipe;
+import org.apache.sling.pipes.internal.slingQuery.ParentPipe;
+import org.apache.sling.pipes.internal.slingQuery.ParentsPipe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -162,6 +165,11 @@ public class PipeBuilderImpl implements PipeBuilder {
 }
 
 @Override
+public PipeBuilder parents(String expr) throws IllegalAccessException {
+return pipe(ParentsPipe.RESOURCE_TYPE).expr(expr);
+}
+
+@Override
 public PipeBuilder ref(String expr) throws IllegalAccessException {
 return pipe(ReferencePipe.RESOURCE_TYPE).expr(expr);
 }
diff --git a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java 
b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
index c6002fc..31d4840 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
@@ -53,6 +53,9 @@ import org.apache.sling.event.jobs.Job;
 import org.apache.sling.event.jobs.JobManager;
 import org.apache.sling.event.jobs.consumer.JobConsumer;
 import org.apache.sling.pipes.*;
+import org.apache.sling.pipes.internal.slingQuery.ChildrenPipe;
+import org.apache.sling.pipes.internal.slingQuery.ParentPipe;
+import org.apache.sling.pipes.internal.slingQuery.ParentsPipe;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -113,13 +116,14 @@ public class PlumberImpl implements Plumber, JobConsumer {
 registerPipe(XPathPipe.RESOURCE_TYPE, XPathPipe.class);
 registerPipe(ReferencePipe.RESOURCE_TYPE, ReferencePipe.class);
 registerPipe(RemovePipe.RESOURCE_TYPE, RemovePipe.class);
-registerPipe(ParentPipe.RESOURCE_TYPE, ParentPipe.class);
+registerPipe(ParentsPipe.RESOURCE_TYPE, ParentsPipe.class);
 registerPipe(MovePipe.RESOURCE_TYPE, MovePipe.class);
 registerPipe(PathPipe.RESOURCE_TYPE, PathPipe.class);
 registerPipe(FilterPipe.RESOURCE_TYPE, FilterPipe.class);
 

[sling-org-apache-sling-pipes] 01/04: SLING-7172 move $ to children pipe

[npeltier]

This is an automated email from the ASF dual-hosted git repository.

npeltier pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git

commit 3ce5caa8302616036874f01267f690682a02d4b1
Author: npeltier 
AuthorDate: Fri Oct 20 17:57:58 2017 +0200

SLING-7172 move $ to children pipe
---
 README.md  | 18 +-
 src/main/java/org/apache/sling/pipes/PipeBuilder.java  |  4 ++--
 .../{SlingQueryPipe.java => ChildrenPipe.java} | 10 +-
 .../apache/sling/pipes/internal/PipeBuilderImpl.java   |  4 ++--
 .../org/apache/sling/pipes/internal/PlumberImpl.java   |  2 +-
 .../apache/sling/pipes/internal/PlumberServlet.java|  2 +-
 src/main/java/org/apache/sling/pipes/package-info.java |  2 +-
 .../java/org/apache/sling/pipes/PipeBuilderTest.java   |  6 +++---
 .../{SlingQueryPipeTest.java => ChildrenPipeTest.java} |  4 ++--
 .../SLING-INF/jcr_root/etc/pipes-it/fruit-list.json|  2 +-
 src/test/resources/{slingQuery.json => children.json}  |  2 +-
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 2105803..badffb4 100644
--- a/README.md
+++ b/README.md
@@ -47,10 +47,10 @@ a pipe configuration is a jcr node, with:
 rather dummy pipe, outputs what is in input (so what is configured in path). 
Handy for doing some test mostly, and giving basic functionalities to others 
that inherit from it
 * `sling:resourceType` is `slingPipes/base`
 
- SlingQuery Pipe
+ children Pipe
 executes $(getInput()).children(expression)
-* `sling:resourceType` is `slingPipes/slingQuery`
-* `expr` mandatory property, contains slingQuery expression through which 
getInput()'s children will be computed to getOutput()
+* `sling:resourceType` is `slingPipes/children`
+* `expr` mandatory property, contains children expression through which 
getInput()'s children will be computed to getOutput()
 
  JsonPipe
 feeds bindings with remote json
@@ -110,7 +110,7 @@ execute the pipe referenced in path property
 
  Write Pipe
 writes given properties to current input
-* `sling:resourceType` is `slingPipes/slingQuery`
+* `sling:resourceType` is `slingPipes/children`
 * `conf` node tree that will be copied to the current input of the pipe, each 
node's properties 
 names and value will be written to the input resource. Input resource will be 
outputed. 
 
@@ -201,7 +201,7 @@ if parameter dryRun is set to true, and the executed pipe 
is supposed to modify
 
 ## sample configurations 
 
-### slingQuery | write
+### children | write
 this pipe parse all profile nodes, and 
 ```
 {
@@ -210,7 +210,7 @@ this pipe parse all profile nodes, and
   "jcr:description":"prefix all full names of profile with "Mr" or "Ms" 
depending on gender",
   "conf":{
 "profile": {
-"sling:resourceType":"slingPipes/slingQuery",
+"sling:resourceType":"slingPipes/children",
 "expr":"nt:unstructured#profile",
 "path":"/home/users"
 },
@@ -225,7 +225,7 @@ this pipe parse all profile nodes, and
 }
 ```
 
-### slingQuery | multiProperty | authorizable | write
+### children | multiProperty | authorizable | write
 ```
 {
   "jcr:primaryType": "sling:Folder",
@@ -239,7 +239,7 @@ this pipe parse all profile nodes, and
   "jcr:description": "outputs all badge component resources",
   "expr": "[sling:resourceType=myApp/components/badge]",
   "path": "/etc/badges/badges-admin/jcr:content",
-  "sling:resourceType": "slingPipes/slingQuery"
+  "sling:resourceType": "slingPipes/children"
   },
 "profile": {
   "jcr:primaryType": "sling:Folder",
@@ -343,5 +343,5 @@ some other samples are in 
https://github.com/npeltier/sling-pipes/tree/master/sr
 # Compatibility
 For running this tool on a sling instance you need:
 - java 8 (Nashorn is used for expression)
-- slingQuery (3.0.0) (used in SlingQueryPipe)
+- children (3.0.0) (used in childrenPipe)
 - jackrabbit api (2.7.5+) (used in AuthorizablePipe)
diff --git a/src/main/java/org/apache/sling/pipes/PipeBuilder.java 
b/src/main/java/org/apache/sling/pipes/PipeBuilder.java
index 17089a3..2082f23 100644
--- a/src/main/java/org/apache/sling/pipes/PipeBuilder.java
+++ b/src/main/java/org/apache/sling/pipes/PipeBuilder.java
@@ -74,11 +74,11 @@ public interface PipeBuilder {
 PipeBuilder xpath(String expr);
 
 /**
- * attach a sling query pipe to the current context
+ * attach a sling query children pipe to the current context
  * @param expr sling query expression
  * @return updated instance of PipeBuilder
  */
-PipeBuilder $(String expr);
+PipeBuilder children(String expr);
 
 /**
  * attach a rm pipe to the current context
diff --git a/src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java 
b/src/main/java/org/apache/sling/pipes/internal/ChildrenPipe.java
similarity index 81%
rename from 

[sling-org-apache-sling-pipes] 04/04: Merge branch 'master' of github.com:apache/sling-org-apache-sling-pipes

[npeltier]

This is an automated email from the ASF dual-hosted git repository.

npeltier pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git

commit 17d88e43d3a372e50c80abfb66e6c18353937804
Merge: 07befc6 51194e6
Author: npeltier 
AuthorDate: Fri Oct 20 22:36:54 2017 +0200

Merge branch 'master' of github.com:apache/sling-org-apache-sling-pipes

 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-pipes] branch master updated (51194e6 -> 17d88e4)

[npeltier]

This is an automated email from the ASF dual-hosted git repository.

npeltier pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git.


from 51194e6  SLING-7162 - Update SCM information in all POM files to 
reference Git
 new 3ce5caa  SLING-7172 move $ to children pipe
 new af8e64e  SLING-7172 add parent(s) pipes
 new 07befc6  SLING-7172 introduce siblings pipe
 new 17d88e4  Merge branch 'master' of 
github.com:apache/sling-org-apache-sling-pipes

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md  | 18 +-
 .../java/org/apache/sling/pipes/PipeBuilder.java   | 23 +
 .../sling/pipes/internal/PipeBuilderImpl.java  | 26 +++
 .../apache/sling/pipes/internal/PlumberImpl.java   | 10 --
 .../sling/pipes/internal/PlumberServlet.java   |  3 +-
 .../AbstractExpressionSlingQueryPipe.java} | 39 ++
 .../AbstractSlingQueryPipe.java}   | 39 +++---
 .../pipes/internal/slingQuery/ChildrenPipe.java}   | 28 +++-
 .../internal/{ => slingQuery}/ParentPipe.java  | 21 +---
 .../ParentsPipe.java}  | 25 ++
 .../pipes/internal/slingQuery/SiblingsPipe.java}   | 30 +++--
 .../java/org/apache/sling/pipes/package-info.java  |  2 +-
 .../org/apache/sling/pipes/AbstractPipeTest.java   |  3 ++
 .../org/apache/sling/pipes/PipeBuilderTest.java|  8 ++---
 .../ChildrenPipeTest.java} |  6 ++--
 .../ParentPipeTest.java}   | 29 ++--
 .../ParentsPipeTest.java}  | 32 --
 .../SiblingsPipeTest.java} | 30 +++--
 .../SLING-INF/jcr_root/content/fruits.json |  5 +++
 .../jcr_root/etc/pipes-it/fruit-list.json  |  2 +-
 .../resources/{slingQuery.json => children.json}   |  2 +-
 21 files changed, 192 insertions(+), 189 deletions(-)
 copy src/main/java/org/apache/sling/pipes/internal/{XPathPipe.java => 
slingQuery/AbstractExpressionSlingQueryPipe.java} (51%)
 rename src/main/java/org/apache/sling/pipes/internal/{SlingQueryPipe.java => 
slingQuery/AbstractSlingQueryPipe.java} (62%)
 copy src/{test/java/org/apache/sling/pipes/dummies/DummyNull.java => 
main/java/org/apache/sling/pipes/internal/slingQuery/ChildrenPipe.java} (60%)
 copy src/main/java/org/apache/sling/pipes/internal/{ => 
slingQuery}/ParentPipe.java (73%)
 rename src/main/java/org/apache/sling/pipes/internal/{ParentPipe.java => 
slingQuery/ParentsPipe.java} (67%)
 copy src/{test/java/org/apache/sling/pipes/dummies/DummyNull.java => 
main/java/org/apache/sling/pipes/internal/slingQuery/SiblingsPipe.java} (66%)
 copy src/test/java/org/apache/sling/pipes/internal/{SlingQueryPipeTest.java => 
slingQuery/ChildrenPipeTest.java} (89%)
 copy src/test/java/org/apache/sling/pipes/internal/{SlingQueryPipeTest.java => 
slingQuery/ParentPipeTest.java} (58%)
 copy src/test/java/org/apache/sling/pipes/internal/{SlingQueryPipeTest.java => 
slingQuery/ParentsPipeTest.java} (61%)
 rename src/test/java/org/apache/sling/pipes/internal/{SlingQueryPipeTest.java 
=> slingQuery/SiblingsPipeTest.java} (58%)
 rename src/test/resources/{slingQuery.json => children.json} (75%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" '].

[sling-org-apache-sling-pipes] 03/04: SLING-7172 introduce siblings pipe

[npeltier]

This is an automated email from the ASF dual-hosted git repository.

npeltier pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git

commit 07befc6da634874f926659f70c5967f82c7facbe
Author: npeltier 
AuthorDate: Fri Oct 20 22:31:59 2017 +0200

SLING-7172 introduce siblings pipe
---
 .../java/org/apache/sling/pipes/PipeBuilder.java   | 16 ++
 .../sling/pipes/internal/PipeBuilderImpl.java  | 18 +++
 .../apache/sling/pipes/internal/PlumberImpl.java   |  2 ++
 .../pipes/internal/slingQuery/SiblingsPipe.java| 37 ++
 .../org/apache/sling/pipes/AbstractPipeTest.java   |  1 +
 .../org/apache/sling/pipes/PipeBuilderTest.java|  2 +-
 .../internal/slingQuery/SiblingsPipeTest.java  | 36 +
 .../SLING-INF/jcr_root/content/fruits.json |  4 +++
 8 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/apache/sling/pipes/PipeBuilder.java 
b/src/main/java/org/apache/sling/pipes/PipeBuilder.java
index 3fe25c2..8033a3a 100644
--- a/src/main/java/org/apache/sling/pipes/PipeBuilder.java
+++ b/src/main/java/org/apache/sling/pipes/PipeBuilder.java
@@ -81,6 +81,13 @@ public interface PipeBuilder {
 PipeBuilder children(String expr);
 
 /**
+ * attach a sling query siblings pipe to the current context
+ * @param expr sling query expression
+ * @return updated instance of PipeBuilder
+ */
+PipeBuilder siblings(String expr);
+
+/**
  * attach a rm pipe to the current context
  * @return updated instance of PipeBuilder
  */
@@ -130,26 +137,23 @@ public interface PipeBuilder {
  * attach a parents pipe to the current context
  * @param expr expression
  * @return updated instance of PipeBuilder
- * @throws IllegalAccessException in case it's called with wrong # of 
arguments
  */
-PipeBuilder parents(String expr) throws IllegalAccessException;
+PipeBuilder parents(String expr);
 
 /**
  * attach a reference pipe to the current context
  * @param expr reference
  * @return updated instance of PipeBuilder
- * @throws IllegalAccessException in case it's called with wrong # of 
arguments
  */
-PipeBuilder ref(String expr)throws IllegalAccessException;
+PipeBuilder ref(String expr);
 
 
 /**
  * attach a not pipe to the current context
  * @param expr reference
  * @return updated instance of PipeBuilder
- * @throws IllegalAccessException in case it's called with wrong # of 
arguments
  */
-PipeBuilder not(String expr)throws IllegalAccessException;
+PipeBuilder not(String expr);
 
 /**
  * parameterized current pipe in the context
diff --git a/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java 
b/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
index 85e78e5..87a4227 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
@@ -26,6 +26,7 @@ import org.apache.sling.pipes.*;
 import org.apache.sling.pipes.internal.slingQuery.ChildrenPipe;
 import org.apache.sling.pipes.internal.slingQuery.ParentPipe;
 import org.apache.sling.pipes.internal.slingQuery.ParentsPipe;
+import org.apache.sling.pipes.internal.slingQuery.SiblingsPipe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -165,18 +166,23 @@ public class PipeBuilderImpl implements PipeBuilder {
 }
 
 @Override
-public PipeBuilder parents(String expr) throws IllegalAccessException {
-return pipe(ParentsPipe.RESOURCE_TYPE).expr(expr);
+public PipeBuilder parents(String expr) {
+return pipeWithExpr(ParentsPipe.RESOURCE_TYPE, expr);
 }
 
 @Override
-public PipeBuilder ref(String expr) throws IllegalAccessException {
-return pipe(ReferencePipe.RESOURCE_TYPE).expr(expr);
+public PipeBuilder siblings(String expr) {
+return pipeWithExpr(SiblingsPipe.RESOURCE_TYPE, expr);
 }
 
 @Override
-public PipeBuilder not(String expr) throws IllegalAccessException {
-return pipe(NotPipe.RESOURCE_TYPE).expr(expr);
+public PipeBuilder ref(String expr) {
+return pipeWithExpr(ReferencePipe.RESOURCE_TYPE, expr);
+}
+
+@Override
+public PipeBuilder not(String expr) {
+return pipeWithExpr(NotPipe.RESOURCE_TYPE, expr);
 }
 
 @Override
diff --git a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java 
b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
index 31d4840..a1e43be 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
@@ -56,6 +56,7 @@ import org.apache.sling.pipes.*;
 import org.apache.sling.pipes.internal.slingQuery.ChildrenPipe;
 import org.apache.sling.pipes.internal.slingQuery.ParentPipe;
 import 

Jenkins build is back to normal : sling-contrib-extensions-distribution-it-1.8 #383

[Apache Jenkins Server]

See 

[sling-site] branch asf-site updated: Last updates to http://sling.apache.org/project-information.html aren't live yet

[bdelacretaz]

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 8075dce  Last updates to 
http://sling.apache.org/project-information.html aren't live yet
8075dce is described below

commit 8075dce939d41c3715525f6ede163eb9d6f83a9c
Author: Bertrand Delacretaz 
AuthorDate: Fri Oct 20 09:53:25 2017 +0200

Last updates to http://sling.apache.org/project-information.html aren't 
live yet
---
 README.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index f05f4cb..ba1757f 100644
--- a/README.md
+++ b/README.md
@@ -5,3 +5,7 @@ This is the asf-site branch of the sling-site repository.
 It holds the content that's published on the Sling website.
 
 Changes to that branch are automatically synced to http://sling.apache.org
+
+If for some reason the http://sling.apache.org content is not updated after
+pushing to this branch, make a minor edit in this file and push again to 
trigger
+the sync process.

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" '].

[sling-org-apache-sling-discovery-api] 25/39: SLING-4505 Relative paths has been set to correct value.

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 5562f28fea1f9deb6e237341461896b1e66a23cb
Author: Robert Munteanu 
AuthorDate: Mon Mar 16 13:22:00 2015 +

SLING-4505 Relative paths has been set to correct value.

Submitted-By: Petr_Shypila 

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1666984 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4f6818f..08b87ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 org.apache.sling
 sling
 22
-../../../parent/pom.xml
+../../../../parent/pom.xml
 
 
 org.apache.sling.discovery.api

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 34/39: Switch to parent pom 26

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit a78089e81acffae4e476d22e939c3c37922ce8fb
Author: Carsten Ziegeler 
AuthorDate: Sun Jan 3 14:07:46 2016 +

Switch to parent pom 26

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 500540b..3856c5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-25
+26
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-caconfig-impl] branch master created (now a7697dd)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git.


  at a7697dd  SLING-7208 CAConfig Impl: Make 
ConfigurationResourceResolverConfig service accessible from outside

This branch includes the following new commits:

 new 4057209  SLING-6427 Move Sling Context-Aware Config out of contrib - 
move in svn - update all SCM URLs - update jenkins build jobs
 new f9bcd18  update to latest version of sling hamcrest
 new 36e30fe  use Sling Parent 30
 new 6c21615  extra bundle plugin config obsolete with parent pom 30
 new 153d6ad  SLING-6669 introduce new SPI 
ConfigurationPersistenceStrategy2, deprecate ConfigurationPersistenceStrategy 
export ConfigurationPersistenceStrategyMultiplexer as part of the management API
 new 8897e8c  SLING-6442 deprecate 
org.apache.sling.caconfig.management.ContextPathStrategyMultiplexer and 
introduce new 
org.apache.sling.caconfig.management.multiplexer.ContextPathStrategyMultiplexer
 new 3e26572  SLING-6442 export 
ConfigurationInheritanceStrategyMultiplexer, 
ConfigurationMetadataProviderMultiplexer, 
ConfigurationResourceResolvingStrategyMultiplexer
 new 44e7cf9  SLING-6442 export ConfigurationOverrideMultiplexer
 new 13c5447  SLING-6442 add @ProviderType annotations
 new cd4c72b  SLING-6671 Context-Aware Config: Lower log level for 
unexpected config paths
 new 8dcc39c  SLING-6674 Context-Aware Config: Separate exception when 
persist failes due to missing access rights
 new ba3adf4  SLING-6674 fine-tune error messages
 new 2d50607  SLING-6669 use resource path instead of resource object for 
getConfigName* methods in ConfigurationPersistenceStrategy2 SPI
 new 16894c9  update dependency
 new a3f3e85  [maven-release-plugin] prepare release 
org.apache.sling.caconfig.impl-1.3.0
 new b937aca  [maven-release-plugin] prepare for next development iteration
 new 367293d  update to next snapshot version until releases available at 
maven central
 new 7c531e0  SLING-6696 Persistence Strategy: Ensure configName is never 
null
 new 1d9b9e8  SLING-6695 Persistence Strategy Adapter: Do not modify 
collection parent name
 new a8b8451  update dependencies
 new 16ca3cc  switch back to released version
 new ad2314e  SLING-6711 Context-Aware Config: Shade commons.osgi dependency
 new 78fb6ba  [maven-release-plugin] prepare release 
org.apache.sling.caconfig.impl-1.3.2
 new ba584c4  [maven-release-plugin] prepare for next development iteration
 new 7e0d463  update sling-mock dependency
 new 63c01c9  git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk@1789581 
13f79535-47bb-0310-9956-ffa450edef68
 new 2d02527  SLING-6788 Context-Aware Config: Make filtered property names 
for configuration persistence configurable
 new 5669f35  SLING-6820 Context-Aware Config: Management API - Provide 
ConfigurationData.isInherited
 new 2eb374b  SLING-6821 Context-Aware Config: Management API - Default 
value for sling:configCollectionInherit for implicit inheritance
 new 284376a  [maven-release-plugin] prepare release 
org.apache.sling.caconfig.impl-1.4.0
 new 0c74f0e  [maven-release-plugin] prepare for next development iteration
 new 2ba7871  SLING-6882 CAConfig Impl: Display context paths and config 
refs in web console
 new 24462d6  SLING-6883 CAConfig: Respect service ranking in ordering 
context path/config ref proposals
 new 57a5ba6  update dependency
 new c115b95  [maven-release-plugin] prepare release 
org.apache.sling.caconfig.impl-1.4.2
 new e0c5d21  [maven-release-plugin] prepare for next development iteration
 new 9aaead9  update to next development version until release version is 
available on maven central
 new a3f4669  switch back to released version
 new 9a15aea  SLING-6935 fix NPE when no config name is given default 
content path to /content fallback to web console resource resolver if no valid 
system user mapping is configured
 new 0ec6a19  SLING-7016 caconfig: Override is not applied for a 
configuration name if no config resource exist
 new 48e9e61  [maven-release-plugin] prepare release 
org.apache.sling.caconfig.impl-1.4.4
 new cdb3fef  [maven-release-plugin] prepare for next development iteration
 new f62e04b  SLING-7165 CAConfig Impl: Potential data loss when saving 
multiple nested configuration lists
 new b4dba38  SLING-7165 more unit tests
 new b1c7f28  SLING-7165 fix problem with resolving config collection item 
name for nested configuration lists
 new a2dedb5  SLING-7167 Adjust READMEs
 new ca2b84b  SLING-7167 Adjust READMEs
 new e102f3a  SLING-7167 Adjust READMEs
 new e5659f3  [maven-release-plugin] prepare release 
org.apache.sling.caconfig.impl-1.4.6
 new 7b5eb1d  [maven-release-plugin] prepare for next development 

[sling-org-apache-sling-discovery-api] 36/39: [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.4

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit d052ace1a1fd878f55f673b0186db597663fcd8b
Author: Stefan Egli 
AuthorDate: Mon Apr 25 09:15:42 2016 +

[maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.4

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1740782 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3856c5c..388ede1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,12 @@
 org.apache.sling
 sling
 26
-
+
 
 
 org.apache.sling.discovery.api
 bundle
-1.0.3-SNAPSHOT
+1.0.4
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.4
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.4
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.4
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 24/39: [maven-release-plugin] prepare for next development iteration

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 76315ee221ce98d46c9c8907cb22249098c6fecc
Author: Carsten Ziegeler 
AuthorDate: Mon Oct 6 16:02:10 2014 +

[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1629689 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3a3e892..4f6818f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.api
 bundle
-1.0.2
+1.0.3-SNAPSHOT
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.2
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.2
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.2
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 37/39: [maven-release-plugin] prepare for next development iteration

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit e97b0f90e22adc7fc04c8d35b77904cafa5fdde1
Author: Stefan Egli 
AuthorDate: Mon Apr 25 09:15:57 2016 +

[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1740784 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 388ede1..9000756 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.api
 bundle
-1.0.4
+1.0.5-SNAPSHOT
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.4
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.4
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.4
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 11/39: Fix constant

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 7bcdf36b2ec815028bf5bdaf2493714349eeba8f
Author: Carsten Ziegeler 
AuthorDate: Tue May 21 11:52:27 2013 +

Fix constant

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1484769 
13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/InstanceDescription.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/discovery/InstanceDescription.java 
b/src/main/java/org/apache/sling/discovery/InstanceDescription.java
index 0c714a3..5baa752 100644
--- a/src/main/java/org/apache/sling/discovery/InstanceDescription.java
+++ b/src/main/java/org/apache/sling/discovery/InstanceDescription.java
@@ -42,7 +42,7 @@ public interface InstanceDescription {
  * Property containing a description for the instance.
  * The instance should provide this property.
  */
-String PROPERTY_DESCRIPTION = "org.apache.sling.instance.name";
+String PROPERTY_DESCRIPTION = "org.apache.sling.instance.description";
 
 /**
  * Property containing endpoints to connect to the instance. The

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 01/39: Move discovery to bundles section

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit a052911e6eeb27f3054a1c8e25c7e7858ae333c8
Author: Carsten Ziegeler 
AuthorDate: Sun May 5 10:35:09 2013 +

Move discovery to bundles section

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1479281 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml|  86 +
 .../org/apache/sling/discovery/ClusterView.java|  57 +++
 .../apache/sling/discovery/DiscoveryService.java   |  50 +++
 .../sling/discovery/InstanceDescription.java   | 106 ++
 .../org/apache/sling/discovery/InstanceFilter.java |  37 ++
 .../apache/sling/discovery/PropertyProvider.java   |  55 +++
 .../org/apache/sling/discovery/TopologyEvent.java  | 158 +
 .../sling/discovery/TopologyEventListener.java |  59 
 .../org/apache/sling/discovery/TopologyView.java   |  71 
 .../discovery/impl/NoClusterDiscoveryService.java  | 392 +
 .../discovery/impl/StandardPropertyProvider.java   | 219 
 .../org/apache/sling/discovery/package-info.java   |  30 ++
 12 files changed, 1320 insertions(+)

diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000..f30d328
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,86 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+org.apache.sling
+sling
+15
+../../../parent/pom.xml
+
+
+org.apache.sling.discovery.api
+bundle
+0.1.0-SNAPSHOT
+
+Apache Sling Discovery API
+
+Support for topology discovery of instances.
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/discovery/api
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/discovery/api
+
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/api
+
+
+
+
+
+org.apache.felix
+maven-scr-plugin
+
+
+org.apache.felix
+maven-bundle-plugin
+true
+
+
+
+
+
+org.apache.felix
+org.apache.felix.scr.annotations
+
+
+biz.aQute
+bndlib
+
+
+org.slf4j
+slf4j-api
+
+
+org.osgi
+org.osgi.core
+
+
+org.osgi
+org.osgi.compendium
+
+
+org.apache.sling
+org.apache.sling.settings
+1.1.0
+provided
+
+
+
diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java 
b/src/main/java/org/apache/sling/discovery/ClusterView.java
new file mode 100644
index 000..64744a1
--- /dev/null
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -0,0 +1,57 @@
+/*
+ * 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.discovery;
+
+import java.util.List;
+
+/**
+ * A ClusterView represents the instances of a cluster that are
+ * up and running and that all can see each other at a certain point in time.
+ * 
+ * A ClusterView can also consist of just one single instance.
+ */
+public interface ClusterView {
+
+   /**
+* Returns an id of this cluster view
+* @return an id of this cluster view
+*/
+String getId();
+
+/**
+ * Provides the list of InstanceDescriptions with a stable ordering.
+ * 
+ * Stable ordering implies that unless an instance leaves the cluster
+ * (due to shutdown/crash/network problems) the instance keeps the
+ * relative position in the list.
+ * @return the list of InstanceDescriptions (with a stable ordering)
+ */
+List getInstances();
+
+   /**
+* Provides the InstanceDescription belonging to the leader 

[sling-org-apache-sling-discovery-api] 35/39: SLING-5683 : moved misleading 'duplicate sling.id' comment of DiscoveryService down to more appropriate ClusterView and TopologyView, changing it to state

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit bb13db81960caecf2a6812ed47af85e299ed25d1
Author: Stefan Egli 
AuthorDate: Mon Apr 25 09:13:27 2016 +

SLING-5683 : moved misleading 'duplicate sling.id' comment of 
DiscoveryService down to more appropriate ClusterView and TopologyView, 
changing it to state that each instance must have a unique sling.id - as that 
is indeed what discovery API wants to ensure/guarantee. Also, added a comment 
about the fact that no topology assumptions whatsoever can be done between 
TOPOLOGY_CHANGING and TOPOLOGY_CHANGED. Both aren't meant to change the API 
really but are rather clarifications to better r [...]

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1740778 
13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/ClusterView.java  | 3 +++
 src/main/java/org/apache/sling/discovery/DiscoveryService.java | 3 ---
 src/main/java/org/apache/sling/discovery/TopologyEvent.java| 5 +
 src/main/java/org/apache/sling/discovery/TopologyView.java | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java 
b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 0e77c48..42f47a1 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -30,6 +30,9 @@ import aQute.bnd.annotation.ProviderType;
  * persistence layer/jcr repository.
  * 
  * A ClusterView can also consist of just one single instance.
+ * 
+ * All instances in a cluster must and do have a unique sling.id.
+ * @see InstanceDescription#getSlingId()
  */
 @ProviderType
 public interface ClusterView {
diff --git a/src/main/java/org/apache/sling/discovery/DiscoveryService.java 
b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
index 8ad7fa6..eebf0da 100644
--- a/src/main/java/org/apache/sling/discovery/DiscoveryService.java
+++ b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
@@ -26,9 +26,6 @@ import aQute.bnd.annotation.ProviderType;
  * The discovery service is in charge of managing live instances that
  * have announced themselves as being part of a topology view. The exact
  * details of how this announcement occurs is implementation dependent.
- * 
- * Note that the discovery service fails if it detects a situation
- * where more than one instance with the same sling.id exists in a cluster.
  */
 @ProviderType
 public interface DiscoveryService {
diff --git a/src/main/java/org/apache/sling/discovery/TopologyEvent.java 
b/src/main/java/org/apache/sling/discovery/TopologyEvent.java
index 65dc13f..20180e0 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyEvent.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyEvent.java
@@ -42,6 +42,11 @@ public class TopologyEvent {
  * being discovered. Once the discovery is finished, a TOPOLOGY_CHANGED
  * is sent with the new topology view.
  * 
+ * After receiving a TOPOLOGY_CHANGING and before receiving a
+ * TOPOLOGY_CHANGED event a TopologyEventListener cannot make any
+ * assumptions wrt the topology whatsoever, including whether or not 
+ * the local instance is part of it at all (partitioning).
+ * 
  * An implementation must always send a TOPOLOGY_CHANGING before a
  * TOPOLOGY_CHANGED.
  */
diff --git a/src/main/java/org/apache/sling/discovery/TopologyView.java 
b/src/main/java/org/apache/sling/discovery/TopologyView.java
index 0352efb..c1f3acb 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyView.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyView.java
@@ -25,7 +25,9 @@ import aQute.bnd.annotation.ProviderType;
 /**
  * A topology view is a cross-cluster list of instances and clusters
  * that have announced themselves with the DiscoveryService.
- *
+ * 
+ * All instances in a topology must and do have a unique sling.id.
+ * @see InstanceDescription#getSlingId()
  */
 @ProviderType
 public interface TopologyView {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 17/39: Update to parent pom 18

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit b0caa0b2e4eb39d3796bcfa1ebc36da812a0b3d8
Author: Carsten Ziegeler 
AuthorDate: Fri Sep 6 12:15:57 2013 +

Update to parent pom 18

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1520554 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 907c7ea..24684c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-17
+18
 ../../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 07/39: [maven-release-plugin] prepare for next development iteration

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit ceb19eacb6dfaa3f23c672c118d9ea9dbd1d701c
Author: Carsten Ziegeler 
AuthorDate: Mon May 13 14:48:25 2013 +

[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1481900 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 238b1cc..c65b3e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.api
 bundle
-1.0.0
+1.0.1-SNAPSHOT
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] branch master created (now d54ac84)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git.


  at d54ac84  SLING-7167 Adjust READMEs

This branch includes the following new commits:

 new a052911  Move discovery to bundles section
 new 5115582  Correct reactor pom and update to parent pom 16
 new 8924396  [maven-release-plugin] prepare release 
org.apache.sling.discovery.api-1.0.0
 new efe64ff  [maven-release-plugin] rollback the release of 
org.apache.sling.discovery.api-1.0.0
 new a12cfc8  Correct/add scm information
 new 124cf42  [maven-release-plugin] prepare release 
org.apache.sling.discovery.api-1.0.0
 new ceb19ea  [maven-release-plugin] prepare for next development iteration
 new d2f876f  Create new standalone module
 new 13ba3d0  Create new standalone project
 new df32c28  Create new standalone module
 new 7bcdf36  Fix constant
 new 3724058  SLING-2892 and SLING-2901 : added a javadoc note about the 
fact that the discovery service fails if it detects duplicate sling.id in a 
cluster
 new 0365627  [maven-release-plugin] prepare release 
org.apache.sling.discovery.api-1.0.0
 new c71305f  [maven-release-plugin] prepare for next development iteration
 new 9e85ec4  Update to latest parent pom
 new e5dae0f  Add ProviderType and ConsumerType annotations
 new b0caa0b  Update to parent pom 18
 new d61f9a5  SLING-3164 : deprecating ClusterView.getId - and adjusting 
the javadoc accordingly
 new f2263d3  SLING-3164 : reverting deprecation of getId and instead 
adjusted javadoc to reflect the fact that the cluster id is stable
 new dafa89b  Update to parent pom v19
 new 7513873  Updated to parent version 20
 new 69590e7  Update to Sling Parent POM 22 with baselining enabled
 new 4975481  [maven-release-plugin] prepare release 
org.apache.sling.discovery.api-1.0.2
 new 76315ee  [maven-release-plugin] prepare for next development iteration
 new 5562f28  SLING-4505 Relative paths has been set to correct value.
 new c6ce72c  SLING-4668 : following clarifying note added to getId: 
'Addition in 1.0.4: this id must consist only of alphanumeric characters plus 
dash '-' and underscore '_'.
 new 41e87c1  SLING-4668 sneak-in: pure javadoc reformatting, no text change
 new ea335b9  SLING-4669: add a comment that a cluster consists of 
instances hooked to the same persistence/repository
 new 709f9a7  SLING-4684 : Stress that handleTopologyEvent() should be 
lock-free and terminate quickly
 new 357a8b6  SLING-4698 - Set parent.relativePath to empty for all modules
 new 68ed4ca  Update to Sling Parent 23
 new b0b8f6f  set parent version to 24 and add empty relativePath where 
missing
 new c906d37  Update the main reactor to parent 25
 new a78089e  Switch to parent pom 26
 new bb13db8  SLING-5683 : moved misleading 'duplicate sling.id' comment of 
DiscoveryService down to more appropriate ClusterView and TopologyView, 
changing it to state that each instance must have a unique sling.id - as that 
is indeed what discovery API wants to ensure/guarantee. Also, added a comment 
about the fact that no topology assumptions whatsoever can be done between 
TOPOLOGY_CHANGING and TOPOLOGY_CHANGED. Both aren't meant to change the API 
really but are rather clarificatio [...]
 new d052ace  [maven-release-plugin] prepare release 
org.apache.sling.discovery.api-1.0.4
 new e97b0f9  [maven-release-plugin] prepare for next development iteration
 new b9881ae  Update to parent pom 30, official OSGi annotations
 new d54ac84  SLING-7167 Adjust READMEs

The 39 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" '].

[sling-org-apache-sling-discovery-api] 21/39: Updated to parent version 20

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 7513873f19d43a2d2186670299847fed1e2efcd4
Author: Robert Munteanu 
AuthorDate: Fri Aug 1 19:16:26 2014 +

Updated to parent version 20

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1615208 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 096cdf3..cbc12e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-19
+20
 ../../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 27/39: SLING-4668 sneak-in: pure javadoc reformatting, no text change

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 41e87c1a6c2f48d732b92489ebd2fcf766e52fba
Author: Stefan Egli 
AuthorDate: Mon Apr 27 13:18:29 2015 +

SLING-4668 sneak-in: pure javadoc reformatting, no text change

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676255 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/discovery/TopologyView.java   | 48 +++---
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/apache/sling/discovery/TopologyView.java 
b/src/main/java/org/apache/sling/discovery/TopologyView.java
index b76695a..0352efb 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyView.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyView.java
@@ -30,21 +30,21 @@ import aQute.bnd.annotation.ProviderType;
 @ProviderType
 public interface TopologyView {
 
-   /**
-* Checks if this TopologyView is currently valid - or if the
-* service knows of a topology change just going on (or another
-* uncertainty about the topology such as IOException etc)
-* @return true if this TopologyView is currently valid, false
-* if the service knows of a topology change just going on (or
-* another issue with discovery like IOException etc)
-*/
-   boolean isCurrent();
+/**
+ * Checks if this TopologyView is currently valid - or if the
+ * service knows of a topology change just going on (or another
+ * uncertainty about the topology such as IOException etc)
+ * @return true if this TopologyView is currently valid, false
+ * if the service knows of a topology change just going on (or
+ * another issue with discovery like IOException etc)
+ */
+boolean isCurrent();
 
-   /**
-* Provides the InstanceDescription belonging to this instance.
-* @return the InstanceDescription belonging to this instance
-*/
-   InstanceDescription getLocalInstance();
+/**
+ * Provides the InstanceDescription belonging to this instance.
+ * @return the InstanceDescription belonging to this instance
+ */
+InstanceDescription getLocalInstance();
 
 /**
  * Provides the set of InstanceDescriptions in the entire topology,
@@ -52,16 +52,16 @@ public interface TopologyView {
  * @return the set of InstanceDescriptions in the entire topology,
  * without any particular order
  */
-   Set getInstances();
+Set getInstances();
 
-   /**
-* Searches through this topology and picks those accepted by the 
provided
-* InstanceFilter - and returns them without any 
particular order
-* @param filter the filter to use
-* @return the set of InstanceDescriptions which were accepted by the 
InstanceFilter,
-* without any particular order
-*/
-   Set findInstances(InstanceFilter filter);
+/**
+ * Searches through this topology and picks those accepted by the provided
+ * InstanceFilter - and returns them without any particular 
order
+ * @param filter the filter to use
+ * @return the set of InstanceDescriptions which were accepted by the 
InstanceFilter,
+ * without any particular order
+ */
+Set findInstances(InstanceFilter filter);
 
 /**
  * Provides the collection of ClusterViews.
@@ -70,5 +70,5 @@ public interface TopologyView {
  * including InstanceDescriptions that form "a cluster of 1"
  * @return the set of ClusterViews, without any particular order
  */
-   Set getClusterViews();
+Set getClusterViews();
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 04/39: [maven-release-plugin] rollback the release of org.apache.sling.discovery.api-1.0.0

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit efe64ffc4675707bc97b21d2a69128717ab292ad
Author: Carsten Ziegeler 
AuthorDate: Mon May 13 14:45:37 2013 +

[maven-release-plugin] rollback the release of 
org.apache.sling.discovery.api-1.0.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1481890 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 238b1cc..67a937c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.api
 bundle
-1.0.0
+0.1.0-SNAPSHOT
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/discovery/api
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/discovery/api
+
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/api
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 39/39: SLING-7167 Adjust READMEs

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit d54ac842a709c6b8a0225faf6631e079b62a3ef8
Author: Oliver Lietz 
AuthorDate: Tue Oct 3 09:20:31 2017 +

SLING-7167 Adjust READMEs

add missing README

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810683 
13f79535-47bb-0310-9956-ffa450edef68
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 000..4f4d135
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Apache Sling Discovery API
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 22/39: Update to Sling Parent POM 22 with baselining enabled

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 69590e73ab815d30d1dd6b17d74a544d8a30abff
Author: Carsten Ziegeler 
AuthorDate: Wed Oct 1 06:57:44 2014 +

Update to Sling Parent POM 22 with baselining enabled

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628622 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml| 2 +-
 src/main/java/org/apache/sling/discovery/package-info.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbc12e2..7347f6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-20
+22
 ../../../parent/pom.xml
 
 
diff --git a/src/main/java/org/apache/sling/discovery/package-info.java 
b/src/main/java/org/apache/sling/discovery/package-info.java
index 387bb0f..b7e26d4 100644
--- a/src/main/java/org/apache/sling/discovery/package-info.java
+++ b/src/main/java/org/apache/sling/discovery/package-info.java
@@ -23,7 +23,7 @@
  *
  * @version 1.0
  */
-@Version("1.0")
+@Version("1.0.2")
 package org.apache.sling.discovery;
 
 import aQute.bnd.annotation.Version;

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 23/39: [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.2

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 497548142230d1df2eaf76a8fd98ff1e6c6d4608
Author: Carsten Ziegeler 
AuthorDate: Mon Oct 6 16:01:48 2014 +

[maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.2

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1629686 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7347f6d..3a3e892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.api
 bundle
-1.0.1-SNAPSHOT
+1.0.2
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.2
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.2
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.2
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 33/39: Update the main reactor to parent 25

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit c906d37c1db115f56ca0d2e442724852dc0a7813
Author: Robert Munteanu 
AuthorDate: Mon Oct 5 10:03:45 2015 +

Update the main reactor to parent 25

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 355f42d..500540b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-24
+25
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 16/39: Add ProviderType and ConsumerType annotations

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit e5dae0fb9d0c65ac66959e3e16a5f9b561578d3c
Author: Carsten Ziegeler 
AuthorDate: Fri Sep 6 09:11:41 2013 +

Add ProviderType and ConsumerType annotations

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1520520 
13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/ClusterView.java   | 3 +++
 src/main/java/org/apache/sling/discovery/DiscoveryService.java  | 5 -
 src/main/java/org/apache/sling/discovery/InstanceDescription.java   | 3 +++
 src/main/java/org/apache/sling/discovery/InstanceFilter.java| 3 +++
 src/main/java/org/apache/sling/discovery/PropertyProvider.java  | 3 +++
 src/main/java/org/apache/sling/discovery/TopologyEventListener.java | 3 +++
 src/main/java/org/apache/sling/discovery/TopologyView.java  | 3 +++
 7 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java 
b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 64744a1..2b3c75e 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -20,12 +20,15 @@ package org.apache.sling.discovery;
 
 import java.util.List;
 
+import aQute.bnd.annotation.ProviderType;
+
 /**
  * A ClusterView represents the instances of a cluster that are
  * up and running and that all can see each other at a certain point in time.
  * 
  * A ClusterView can also consist of just one single instance.
  */
+@ProviderType
 public interface ClusterView {
 
/**
diff --git a/src/main/java/org/apache/sling/discovery/DiscoveryService.java 
b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
index 3ef52f3..8ad7fa6 100644
--- a/src/main/java/org/apache/sling/discovery/DiscoveryService.java
+++ b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.discovery;
 
+import aQute.bnd.annotation.ProviderType;
+
 /**
  * The discovery service can be used to get the current topology view.
  * 
@@ -26,8 +28,9 @@ package org.apache.sling.discovery;
  * details of how this announcement occurs is implementation dependent.
  * 
  * Note that the discovery service fails if it detects a situation
- * where more than one instance with the same sling.id exists in a cluster. 
+ * where more than one instance with the same sling.id exists in a cluster.
  */
+@ProviderType
 public interface DiscoveryService {
 
/**
diff --git a/src/main/java/org/apache/sling/discovery/InstanceDescription.java 
b/src/main/java/org/apache/sling/discovery/InstanceDescription.java
index 5baa752..9cde2cf 100644
--- a/src/main/java/org/apache/sling/discovery/InstanceDescription.java
+++ b/src/main/java/org/apache/sling/discovery/InstanceDescription.java
@@ -20,6 +20,8 @@ package org.apache.sling.discovery;
 
 import java.util.Map;
 
+import aQute.bnd.annotation.ProviderType;
+
 /**
  * An InstanceDescription represents and contains information about an
  * instance that is part of a TopologyView.
@@ -30,6 +32,7 @@ import java.util.Map;
  *
  * @see TopologyView
  */
+@ProviderType
 public interface InstanceDescription {
 
 /**
diff --git a/src/main/java/org/apache/sling/discovery/InstanceFilter.java 
b/src/main/java/org/apache/sling/discovery/InstanceFilter.java
index a6e5a51..f25b771 100644
--- a/src/main/java/org/apache/sling/discovery/InstanceFilter.java
+++ b/src/main/java/org/apache/sling/discovery/InstanceFilter.java
@@ -18,11 +18,14 @@
  */
 package org.apache.sling.discovery;
 
+import aQute.bnd.annotation.ConsumerType;
+
 /**
  * Used to filter InstanceDescriptions in a TopologyView.
  * 
  * @see DiscoveryService#findInstances(InstanceFilter)
  */
+@ConsumerType
 public interface InstanceFilter {
 
/**
diff --git a/src/main/java/org/apache/sling/discovery/PropertyProvider.java 
b/src/main/java/org/apache/sling/discovery/PropertyProvider.java
index 2fa21f8..c4b292c 100644
--- a/src/main/java/org/apache/sling/discovery/PropertyProvider.java
+++ b/src/main/java/org/apache/sling/discovery/PropertyProvider.java
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.discovery;
 
+import aQute.bnd.annotation.ConsumerType;
+
 
 /**
  * The PropertyProvider service interface may be implemented by
@@ -30,6 +32,7 @@ package org.apache.sling.discovery;
  * change, the service registration of the provider should be updated.
  * This avoids periodic polling for changes.
  */
+@ConsumerType
 public interface PropertyProvider {
 
 /**
diff --git 
a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java 
b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
index aed95c6..8e199ce 100644
--- 

[sling-org-apache-sling-discovery-api] 31/39: Update to Sling Parent 23

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 68ed4cac4ab321348a3380946d4430fbb1b03203
Author: Robert Munteanu 
AuthorDate: Thu Jun 25 13:08:16 2015 +

Update to Sling Parent 23

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7e6dbf9..a43cdfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-22
+23
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 14/39: [maven-release-plugin] prepare for next development iteration

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit c71305f82a6f2157ac3690790d4081462e30fae1
Author: Carsten Ziegeler 
AuthorDate: Tue Jul 9 13:08:11 2013 +

[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1501244 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79bb295..a6f875e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.api
 bundle
-1.0.0
+1.0.1-SNAPSHOT
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 06/39: [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.0

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 124cf42cb13139a26a1a9f929f14b8f4fadfce3d
Author: Carsten Ziegeler 
AuthorDate: Mon May 13 14:48:05 2013 +

[maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1481897 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7c6cba..238b1cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.api
 bundle
-0.1.0-SNAPSHOT
+1.0.0
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.0
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 32/39: set parent version to 24 and add empty relativePath where missing

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit b0b8f6fcf51e4eacd122c628bd9eb5b6b3a2b6c2
Author: Oliver Lietz 
AuthorDate: Tue Jul 7 08:09:17 2015 +

set parent version to 24 and add empty relativePath where missing

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a43cdfb..355f42d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-23
+24
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 30/39: SLING-4698 - Set parent.relativePath to empty for all modules

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 357a8b6e6ec1126b607cb187e212c04a74f83f86
Author: Robert Munteanu 
AuthorDate: Thu May 7 10:14:40 2015 +

SLING-4698 - Set parent.relativePath to empty for all modules

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 08b87ff..7e6dbf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 org.apache.sling
 sling
 22
-../../../../parent/pom.xml
+
 
 
 org.apache.sling.discovery.api

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 28/39: SLING-4669: add a comment that a cluster consists of instances hooked to the same persistence/repository

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit ea335b99d6b452305912b616142e4ae56684d7c7
Author: Stefan Egli 
AuthorDate: Mon Apr 27 13:23:12 2015 +

SLING-4669: add a comment that a cluster consists of instances hooked to 
the same persistence/repository

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676256 
13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/ClusterView.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java 
b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 3914fcf..0e77c48 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -26,6 +26,9 @@ import aQute.bnd.annotation.ProviderType;
  * A ClusterView represents the instances of a cluster that are
  * up and running and that all can see each other at a certain point in time.
  * 
+ * 'Seeing each other'/A cluster refers to being hooked to the same underlying
+ * persistence layer/jcr repository.
+ * 
  * A ClusterView can also consist of just one single instance.
  */
 @ProviderType

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 02/39: Correct reactor pom and update to parent pom 16

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 511558208d2bd70a9624273689b2d0d79c908ce3
Author: Carsten Ziegeler 
AuthorDate: Sun May 5 14:38:24 2013 +

Correct reactor pom and update to parent pom 16

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1479333 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f30d328..67a937c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-15
+16
 ../../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 08/39: Create new standalone module

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit d2f876f55cb12ef71f8c92ae82b75cdaa8a5e7d2
Author: Carsten Ziegeler 
AuthorDate: Tue May 14 07:47:45 2013 +

Create new standalone module

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1482239 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../discovery/impl/NoClusterDiscoveryService.java  | 392 -
 .../discovery/impl/StandardPropertyProvider.java   | 219 
 2 files changed, 611 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java 
b/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java
deleted file mode 100644
index cfb3c6b..000
--- 
a/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * 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.discovery.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.discovery.ClusterView;
-import org.apache.sling.discovery.DiscoveryService;
-import org.apache.sling.discovery.InstanceDescription;
-import org.apache.sling.discovery.InstanceFilter;
-import org.apache.sling.discovery.PropertyProvider;
-import org.apache.sling.discovery.TopologyEvent;
-import org.apache.sling.discovery.TopologyEvent.Type;
-import org.apache.sling.discovery.TopologyEventListener;
-import org.apache.sling.discovery.TopologyView;
-import org.apache.sling.settings.SlingSettingsService;
-import org.osgi.framework.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This is a simple implementation of the discovery service
- * which can be used for a cluster less installation (= single instance).
- * It is disabled by default and can be enabled through a OSGi configuration.
- */
-@Component(policy = ConfigurationPolicy.REQUIRE, immediate=true)
-@Service(value = {DiscoveryService.class})
-public class NoClusterDiscoveryService implements DiscoveryService {
-
-/** The logger. */
-private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-/**
- * Sling settings service to get the Sling ID and run modes.
- */
-@Reference
-private SlingSettingsService settingsService;
-
-/**
- * All topology event listeners.
- */
-@Reference(cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = 
ReferencePolicy.DYNAMIC)
-private TopologyEventListener[] listeners = new TopologyEventListener[0];
-
-/**
- * All property providers.
- */
-@Reference(cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = 
ReferencePolicy.DYNAMIC,
-   referenceInterface=PropertyProvider.class, 
updated="updatedPropertyProvider")
-private List providerInfos = new ArrayList();
-
-/**
- * Special lock object to sync data structure access
- */
-private final Object lock = new Object();
-
-/**
- * The current topology view.
- */
-private TopologyView topologyView;
-
-private Map cachedProperties = new HashMap();
-
-/**
- * Activate this service
- * Create a new description.
- */
-@Activate
-protected void activate() {
-logger.debug("NoClusterDiscoveryService started.");
-final InstanceDescription 

[sling-org-apache-sling-commons-threads] branch master created (now c9de8f4)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git.


  at c9de8f4  SLING-7167 Adjust READMEs

This branch includes the following new commits:

 new e9c802f  SLING-865 : Move to bundles
 new fd90599  SLING-865 : Adjust reactor pom and svn information in each 
module.
 new 7c3b93f  SLING-865 : Adjust path to parent pom and add profiles for 
samples and contrib
 new d09dc16  Use release parent pom
 new e2d95cb  [maven-release-plugin] prepare release 
org.apache.sling.commons.threads-2.0.4-incubator
 new fc7fde3  [maven-release-plugin] prepare for next development iteration
 new 0011c43  Use next dev version of parent pom
 new 345398c  Set parent pom to released version.
 new 13ddfdc  Move Sling to new TLP location
 new 5da21c6  Move Sling to new TLP location
 new 7aca17c  SLING-1011 : Remove disclaimer file.
 new 38a83fc  SLING-1011 : Adjust svn location
 new a3ae71e  SLING-1011 : Remove disclaimer from readme's, adjust links to 
webite, fix versions in poms.
 new 461d465  SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app 
has the leglize stuff, too)
 new 3b3ac26  SLING-1205 Upgrade all projects to parent POM 8 and use OSGi 
provided OSGi libraries
 new 3ed1003  SLING-1244 : Redesign thread pool management
 new d8c5759  [maven-release-plugin] prepare release 
org.apache.sling.commons.threads-3.0.0
 new 9637b71  [maven-release-plugin] prepare for next development iteration
 new 891a1af  Add some more debug information.
 new 8e892b6  Fix typo
 new 8cdc770  Use released parent pom.
 new ebf06f7  SLING-1699 : New default configuration is created on each 
startup
 new cbaeeaf  Update notice files
 new 217f651  [maven-release-plugin] prepare release 
org.apache.sling.commons.threads-3.0.2
 new 554f86f  [maven-release-plugin] prepare for next development iteration
 new 01423f9  SLING-1819 : Unused custom thread pool is never removed
 new 92b579e  SLING-1820 : Display current pool statistics in web console
 new e26aaa2  SLING-1821 :  Custom thread pools should get an optional label
 new 2d02353  Add a web console label
 new 7317704  SLING-1833 : Remove direct dependency to web console by using 
new configuration printer support
 new c212a9a  Prepare for release.
 new dbf69cf  [maven-release-plugin] prepare release 
org.apache.sling.commons.threads-3.1.0
 new f4083be  [maven-release-plugin] prepare for next development iteration
 new e454d5e  updating all modules to parent 10-SNAPSHOT in anticipation of 
emma additions to parent
 new 54cad09  Update to recent snapshots
 new 8c5adc9  Use latest releases.
 new abaf247  SLING-2150 : Update plugins to use the latest available 
versions
 new 0c6b7b5  Update to recent snapshot
 new aba59f2  Using latest released parent pom
 new 60fead9  SLING-2187 - adding new module to contain our custom notice 
file; adding remote-resources plugin configuration to parent pom and removing 
all existing appended-resources NOTICE files
 new 2b96672  temporarily using snapshots during release vote
 new 54c6abf  using latest releases
 new aeb162d  SLING-2480 : Add config for maven-sling-plugin to m2e 
configuration
 new eb4da29  Update to latest parent pom
 new 07bcb28  Use released versions
 new 6134a9d  Typo
 new 4f207e8  SLING-2540 : Allow the ThreadPool to process 
Callable/Runnable and return a Future. Apply patch from Timothee Maret
 new 19339b2  SLING-2563 - auto generate label based on a stack trace
 new f1a639a  SLING-2564 - adding JMX monitoring of Sling Thread Pools
 new 9d1e281  SLING-2535 wrapped the reference counter in a dedicated 
synchronised block to ensure that all access to the counter is safe. I think 
this will be safer than calling from within synchronised blocks as it doesnt 
rely on the caller remembering the methods need to be single threaded.
 new 8a0b66c  SLING-2535 Undid my previous commit and put the 
synchronisation one layer further out as orriginally suggested. Synchronising 
in incUsage and decUsage is too risky from a deadlock point of view. Added 
Javadoc to warn about thread safety on the methods.
 new 56dc2ee  Use latest releases and update to new parent pom
 new 6ea2b73  Update to latest parent pom and use latest releases in 
launchpad
 new 88a0460  Correct reactor pom and update to parent pom 16
 new e9e41e0  SLING-2858 - Maven build fails after upgrading to parent 16: 
No annotation processors found in classpath
 new cf2f1c4  Update to latest parent pom
 new f41203f  Update to parent pom 18
 new 4a021ac  [maven-release-plugin] prepare release 
org.apache.sling.commons.threads-3.2.0
 new cb55c8c  [maven-release-plugin] prepare for next development 

[sling-org-apache-sling-discovery-api] 18/39: SLING-3164 : deprecating ClusterView.getId - and adjusting the javadoc accordingly

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit d61f9a5c8d3ae0644967e069bd9f6638e75476c1
Author: Stefan Egli 
AuthorDate: Mon Oct 14 09:25:32 2013 +

SLING-3164 : deprecating ClusterView.getId - and adjusting the javadoc 
accordingly

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1531829 
13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/ClusterView.java | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java 
b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 2b3c75e..07d5f7f 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -32,8 +32,20 @@ import aQute.bnd.annotation.ProviderType;
 public interface ClusterView {
 
/**
-* Returns an id of this cluster view
+* Returns an id of this cluster view.
+* 
+* Note that this id is not guaranteed to be stable between
+* instances of ClusterViews. The id is identifying only the
+* current view of the cluster, not the cluster itself, and 
+* thus if the view changes the id might (or might not) change.
 * @return an id of this cluster view
+* @deprecated due to the unstable nature of this id - it only
+* identifies the current view of the cluster, not the cluster
+* itself - this id has been deprecated. If an id of the cluster
+* itself is needed, this must be dealt with on an application
+* level - for example by letting the cluster leader define
+* such an id and taking care of special cases like cluster joins.
+* @see http://issues.apache.org/jira/browse/SLING-3164;>SLING-3164
 */
 String getId();
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 19/39: SLING-3164 : reverting deprecation of getId and instead adjusted javadoc to reflect the fact that the cluster id is stable

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit f2263d33cdb4eed733081370048980e635d61a2e
Author: Stefan Egli 
AuthorDate: Thu Oct 31 10:33:58 2013 +

SLING-3164 : reverting deprecation of getId and instead adjusted javadoc to 
reflect the fact that the cluster id is stable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1537429 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/discovery/ClusterView.java| 27 +-
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java 
b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 07d5f7f..f50612b 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -32,20 +32,25 @@ import aQute.bnd.annotation.ProviderType;
 public interface ClusterView {
 
/**
-* Returns an id of this cluster view.
+* Returns a stable id of the cluster represented by this
+* cluster view.
 * 
-* Note that this id is not guaranteed to be stable between
-* instances of ClusterViews. The id is identifying only the
-* current view of the cluster, not the cluster itself, and 
-* thus if the view changes the id might (or might not) change.
+* Similar to the SlingID, this id is persisted and thus
+* remains stable accross instance/cluster restarts.
+* 
+* When an instance joins a cluster, it will inherit
+* the id from the joined cluster (thus incurs a cluster id
+* change).
+* 
+* Note: When instances part from a cluster (eg due to a network
+* partitioning) the cluster id is retained. This results in
+* potentially multiple clusters with the same id. This 
+* fact could be used to detect such partitioning/split brain
+* situations. It also implies though that the cluster id
+* is not guaranteed to be unique in a topology!
 * @return an id of this cluster view
-* @deprecated due to the unstable nature of this id - it only
-* identifies the current view of the cluster, not the cluster
-* itself - this id has been deprecated. If an id of the cluster
-* itself is needed, this must be dealt with on an application
-* level - for example by letting the cluster leader define
-* such an id and taking care of special cases like cluster joins.
 * @see http://issues.apache.org/jira/browse/SLING-3164;>SLING-3164
+* @since exists since 1.0.0 - stable since 1.0.2
 */
 String getId();
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 05/39: Correct/add scm information

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit a12cfc81b9f403adb23e72821385f5ae43d5bd21
Author: Carsten Ziegeler 
AuthorDate: Mon May 13 14:47:32 2013 +

Correct/add scm information

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1481895 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67a937c..a7c6cba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/discovery/api
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/discovery/api
-
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/api
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-fragment-ws] 03/28: SLING-2480 : Add config for maven-sling-plugin to m2e configuration

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fragment-ws.git

commit 126e63b71e63160070c4f6ad4f3af87ccbde4f14
Author: Carsten Ziegeler 
AuthorDate: Wed May 16 07:39:13 2012 +

SLING-2480 : Add config for maven-sling-plugin to m2e configuration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1339038 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8e5eb0d..a042874 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-12
+13-SNAPSHOT
 ../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-fragment-ws] 26/28: SLING-7167 Adjust READMEs

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fragment-ws.git

commit 50cca13f29197a60ef9a37b0a7c50c223d803094
Author: Oliver Lietz 
AuthorDate: Mon Oct 2 14:55:15 2017 +

SLING-7167 Adjust READMEs

remove outdated information

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810386 
13f79535-47bb-0310-9956-ffa450edef68
---
 README.txt | 23 ---
 1 file changed, 23 deletions(-)

diff --git a/README.txt b/README.txt
index 5945ea6..b99e8bf 100755
--- a/README.txt
+++ b/README.txt
@@ -7,26 +7,3 @@ packages gives no guarantee the platform provides them.
 For proper setup it is suggested to either install an
 extension fragment adapted to the platform or to install
 regular API packages as bundles.
-
-Getting Started
-===
-
-This component uses a Maven 2 (http://maven.apache.org/) build
-environment. It requires a Java 5 JDK (or higher) and Maven 
(http://maven.apache.org/)
-2.2.1 or later. We recommend to use the latest Maven version.
-
-If you have Maven 2 installed, you can compile and
-package the jar using the following command:
-
-mvn package
-
-See the Maven 2 documentation for other build features.
-
-The latest source code for this component is available in the
-Subversion (http://subversion.tigris.org/) source repository of
-the Apache Software Foundation. If you have Subversion installed,
-you can checkout the latest source using the following command:
-
-svn checkout 
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/framework-extension-ws
-
-See the Subversion documentation for other source control features.

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-event] 24/26: [maven-release-plugin] prepare release org.apache.sling.event-4.2.8

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git

commit 733d16196ec0eff4d6619c9e67dd6f7707ed38f3
Author: Robert Munteanu 
AuthorDate: Wed Sep 20 11:53:37 2017 +

[maven-release-plugin] prepare release org.apache.sling.event-4.2.8

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1809005 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a9a1465..7665ba8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.event
 bundle
-4.2.7-SNAPSHOT
+4.2.8
 
 Apache Sling Event Support
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-4.2.8
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-4.2.8
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-4.2.8
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-fragment-ws] 15/28: Update to latest parent pom

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fragment-ws.git

commit df287c9e46ee55d9c3c4d19e2f940ff0447a2efe
Author: Carsten Ziegeler 
AuthorDate: Fri Jul 19 07:04:15 2013 +

Update to latest parent pom

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1504788 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7db42f4..ed3a27d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-16
+17
 ../../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-fragment-ws] 01/28: SLING-2103 Add new system bundle extension fragment exposing WS API

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fragment-ws.git

commit d41c5370f9fb509ef8e5e1980537bde3cd03c2d4
Author: Felix Meschberger 
AuthorDate: Sat Nov 12 20:36:05 2011 +

SLING-2103 Add new system bundle extension fragment exposing WS API

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1201319 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 99 +
 1 file changed, 99 insertions(+)

diff --git a/pom.xml b/pom.xml
new file mode 100755
index 000..8e5eb0d
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,99 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+org.apache.sling
+sling
+12
+../../parent/pom.xml
+
+
+org.apache.sling.fragment.ws
+0.0.1-SNAPSHOT
+jar
+
+Apache Sling System Bundle Extension: WS APIs
+
+Adds the WS API packages to the system bundle exports.
+The list of packages is derived from the packages available
+in the Java 7 platform. The system bundle exporting these
+packages gives no guarantee the platform provides them.
+For proper setup it is suggested to either install an
+extension fragment adapted to the platform or to install
+regular API packages as bundles.
+
+
+
+0.0.0.fragment_ws
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+
+bundle-manifest
+process-classes
+
+manifest
+
+
+
+
+
+
+system.bundle;extension:=framework
+
+
+
+
+
+maven-jar-plugin
+
+true
+
+
+
${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+
+
+
javax.jws.soap;version="${fragment.ws.version}",
+
javax.jws;version="${fragment.ws.version}",
+
javax.xml.soap;uses:="javax.activation,javax.xml.namespace,org.w3c.dom,javax.xml.transform.dom,javax.xml.transform";version="${fragment.ws.version}",
+
javax.xml.ws.handler.soap;uses:="javax.xml.ws.handler,javax.xml.namespace,javax.xml.soap,javax.xml.bind";version="${fragment.ws.version}",
+
javax.xml.ws.handler;uses:="javax.xml.ws,javax.xml.namespace";version="${fragment.ws.version}",
+
javax.xml.ws.http;uses:="javax.xml.ws";version="${fragment.ws.version}",
+
javax.xml.ws.soap;uses:="javax.xml.ws.spi,javax.xml.ws,javax.xml.soap";version="${fragment.ws.version}",
+
javax.xml.ws.spi.http;version="${fragment.ws.version}",
+
javax.xml.ws.spi;uses:="javax.xml.ws,javax.xml.ws.wsaddressing,javax.xml.transform,org.w3c.dom,javax.xml.namespace,javax.xml.ws.handler,javax.xml.bind";version="${fragment.ws.version}",
+
javax.xml.ws.wsaddressing;uses:="javax.xml.bind.annotation,javax.xml.namespace,org.w3c.dom,javax.xml.transform,javax.xml.bind,javax.xml.ws,javax.xml.ws.spi";version="${fragment.ws.version}",
+
javax.xml.ws;uses:="javax.xml.ws.handler,javax.xml.ws.spi,javax.xml.ws.spi.http,javax.xml.transform,org.w3c.dom,javax.xml.bind.annotation,javax.xml.transform.stream,javax.xml.bind,javax.xml.namespace";version="${fragment.ws.version}"
+
+
+
+
+
+
+
+

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-event] 03/26: SLING-6739 : split of sling.event to sling.event.resource (and api). Use old project name / bundle symbolic name and version for compatibility

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git

commit 47276aa93ad0f6d6c9ed494e0ed19c92037e7093
Author: Carsten Ziegeler 
AuthorDate: Mon Apr 10 05:52:57 2017 +

SLING-6739 : split of sling.event to sling.event.resource (and api). Use 
old project name / bundle symbolic name and version for compatibility

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1790780 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 91bb496..641a79b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,9 @@
 
 
 
-org.apache.sling.event.resource
+org.apache.sling.event
 bundle
-0.0.1-SNAPSHOT
+4.2.3-SNAPSHOT
 
 Apache Sling Event Support
 
@@ -38,7 +38,7 @@
 
 
 
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resourc33
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-event] 18/26: SLING-7039: Clean up jobs in state dropped and errors.

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git

commit 01a8b91b0849441ea1bd14432f4d334dbe65eeb5
Author: Karl Pauls 
AuthorDate: Thu Aug 10 08:29:12 2017 +

SLING-7039: Clean up jobs in state dropped and errors.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1804640 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../impl/jobs/config/JobManagerConfiguration.java  |  33 +++--
 .../sling/event/impl/jobs/tasks/CleanUpTask.java   |  74 ++-
 .../event/impl/jobs/tasks/HistoryCleanUpTask.java  |  14 +--
 .../jobs/tasks/HistoryCleanUpRemovedJobsTest.java  | 137 +
 4 files changed, 237 insertions(+), 21 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
 
b/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
index f3647c6..45ecc3b 100644
--- 
a/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
+++ 
b/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
@@ -18,16 +18,6 @@
  */
 package org.apache.sling.event.impl.jobs.config;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.ResourceResolver;
@@ -58,6 +48,16 @@ import 
org.osgi.service.metatype.annotations.ObjectClassDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
 /**
  * Configuration of the job handling
  *
@@ -87,6 +87,11 @@ public class JobManagerConfiguration {
   description="Specify amount in seconds that job manager waits on 
startup before starting with job handling. "
 + "This can be used to allow enough time to restart a 
cluster before jobs are eventually reassigned.")
 long startup_delay() default 30;
+
+@AttributeDefinition(name = "Clean-up removed jobs period",
+description = "Specify the periodic interval in minutes (default 
is 48h - use 0 to disable) after which " +
+"removed jobs (ERROR or DROPPED) should be cleaned from 
the repository.")
+int cleanup_period() default 2880;
 }
 /** Logger. */
 private final Logger logger = 
LoggerFactory.getLogger("org.apache.sling.event.impl.jobs");
@@ -149,6 +154,8 @@ public class JobManagerConfiguration {
 /** The resource path where scheduled jobs are stored - ending with a 
slash. */
 private String scheduledJobsPathWithSlash;
 
+private volatile int historyCleanUpRemovedJobs;
+
 /** List of topology awares. */
 private final List listeners = new 
ArrayList<>();
 
@@ -200,6 +207,8 @@ public class JobManagerConfiguration {
 DEFAULT_SCHEDULED_JOBS_PATH);
 this.scheduledJobsPathWithSlash = this.scheduledJobsPath + "/";
 
+this.historyCleanUpRemovedJobs = config.cleanup_period();
+
 // create initial resources
 final ResourceResolver resolver = this.createResourceResolver();
 try {
@@ -254,6 +263,9 @@ public class JobManagerConfiguration {
 this.stopProcessing();
 }
 
+public int getHistoryCleanUpRemovedJobs() {
+return this.historyCleanUpRemovedJobs;
+}
 /**
  * Is this component still active?
  * @return Active?
@@ -450,7 +462,6 @@ public class JobManagerConfiguration {
 
 /**
  * Stop processing
- * @param deactivate Whether to deactivate the capabilities
  */
 private void stopProcessing() {
 logger.debug("Stopping job processing...");
diff --git 
a/src/main/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTask.java 
b/src/main/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTask.java
index 7fdcb88..2b9cf4f 100644
--- a/src/main/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTask.java
+++ b/src/main/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTask.java
@@ -18,18 +18,23 @@
  */
 package org.apache.sling.event.impl.jobs.tasks;
 
-import java.util.Calendar;
-import java.util.Iterator;
-
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import 

[sling-org-apache-sling-discovery-api] 20/39: Update to parent pom v19

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit dafa89bf61eee1dae351175393236cf670b35a65
Author: Carsten Ziegeler 
AuthorDate: Mon Mar 31 14:39:20 2014 +

Update to parent pom v19

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1583337 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 24684c3..096cdf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-18
+19
 ../../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 13/39: [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.0

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 0365627e753015cd023421cdce91a5b4c1d9a0f2
Author: Carsten Ziegeler 
AuthorDate: Tue Jul 9 13:07:52 2013 +

[maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1501242 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6f875e..79bb295 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.discovery.api
 bundle
-1.0.1-SNAPSHOT
+1.0.0
 
 Apache Sling Discovery API
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.0
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-event] 10/26: Remove unused import

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git

commit cc2ea9e6bbda2050060ca3205dcdb64a6af1ce66
Author: Carsten Ziegeler 
AuthorDate: Mon May 22 05:48:22 2017 +

Remove unused import

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1795774 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/event/it/ChaosTest.java   | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/test/java/org/apache/sling/event/it/ChaosTest.java 
b/src/test/java/org/apache/sling/event/it/ChaosTest.java
index 100beec..1538593 100644
--- a/src/test/java/org/apache/sling/event/it/ChaosTest.java
+++ b/src/test/java/org/apache/sling/event/it/ChaosTest.java
@@ -45,7 +45,6 @@ import org.apache.sling.event.jobs.JobManager;
 import org.apache.sling.event.jobs.NotificationConstants;
 import org.apache.sling.event.jobs.QueueConfiguration;
 import org.apache.sling.event.jobs.consumer.JobConsumer;
-import org.apache.sling.testing.tools.sling.TimeoutsProvider;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -62,7 +61,7 @@ public class ChaosTest extends AbstractJobHandlingTest {
 
 /** Duration for firing jobs in seconds. */
 private static final long DURATION = 1 * 60;
-
+
 private static final int NUM_ORDERED_THREADS = 3;
 private static final int NUM_PARALLEL_THREADS = 6;
 private static final int NUM_ROUND_THREADS = 6;
@@ -98,7 +97,7 @@ public class ChaosTest extends AbstractJobHandlingTest {
 
 // create ordered test queue
 final org.osgi.service.cm.Configuration orderedConfig = 
this.configAdmin.createFactoryConfiguration("org.apache.sling.event.jobs.QueueConfiguration",
 null);
-final Dictionary orderedProps = new Hashtable();
+final Dictionary orderedProps = new Hashtable<>();
 orderedProps.put(ConfigurationConstants.PROP_NAME, "chaos-ordered");
 orderedProps.put(ConfigurationConstants.PROP_TYPE, 
QueueConfiguration.Type.ORDERED.name());
 orderedProps.put(ConfigurationConstants.PROP_TOPICS, ORDERED_TOPICS);
@@ -108,7 +107,7 @@ public class ChaosTest extends AbstractJobHandlingTest {
 
 // create round robin test queue
 final org.osgi.service.cm.Configuration rrConfig = 
this.configAdmin.createFactoryConfiguration("org.apache.sling.event.jobs.QueueConfiguration",
 null);
-final Dictionary rrProps = new Hashtable();
+final Dictionary rrProps = new Hashtable<>();
 rrProps.put(ConfigurationConstants.PROP_NAME, "chaos-roundrobin");
 rrProps.put(ConfigurationConstants.PROP_TYPE, 
QueueConfiguration.Type.TOPIC_ROUND_ROBIN.name());
 rrProps.put(ConfigurationConstants.PROP_TOPICS, ROUND_TOPICS);
@@ -239,7 +238,7 @@ public class ChaosTest extends AbstractJobHandlingTest {
  */
 private void setupChaosThreads(final List threads,
 final AtomicLong finishedThreads) {
-final List views = new ArrayList();
+final List views = new ArrayList<>();
 // register topology listener
 final ServiceRegistration reg = 
this.bc.registerService(TopologyEventListener.class, new 
TopologyEventListener() {
 
@@ -313,10 +312,10 @@ public class ChaosTest extends AbstractJobHandlingTest {
 // setup added, created and finished map
 // added and finished are filled by notifications
 // created is filled by the threads starting jobs
-final Map added = new HashMap();
-final Map created = new HashMap();
-final Map finished = new HashMap();
-final List topics = new ArrayList();
+final Map added = new HashMap<>();
+final Map created = new HashMap<>();
+final Map finished = new HashMap<>();
+final List topics = new ArrayList<>();
 for(int i=0;i();
 final AtomicLong finishedThreads = new AtomicLong();
 
 this.registerEventHandler("org/apache/sling/event/notification/job/*",
@@ -379,7 +378,7 @@ public class ChaosTest extends AbstractJobHandlingTest {
 }
 
 System.out.println("Waiting for job handling to finish...");
-final Set allTopics = new 

[sling-org-apache-sling-fragment-ws] 18/28: Updated to parent version 20

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fragment-ws.git

commit 651b4ad14f96e6d5e5b4bad657522cb22edbe103
Author: Robert Munteanu 
AuthorDate: Fri Aug 1 19:16:26 2014 +

Updated to parent version 20

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1615208 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7899ed8..8e29578 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-19
+20
 ../../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-event] 19/26: [maven-release-plugin] prepare release org.apache.sling.event-4.2.6

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git

commit fab5cab1f3d3893b6b28c3692ccf31ed3fc50e94
Author: Karl Pauls 
AuthorDate: Thu Aug 10 09:45:53 2017 +

[maven-release-plugin] prepare release org.apache.sling.event-4.2.6

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1804650 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ff4cc7..558ea54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.sling.event
 bundle
-4.2.5-SNAPSHOT
+4.2.6
 
 Apache Sling Event Support
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/resource
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-4.2.6
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-4.2.6
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-4.2.6
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 10/39: Create new standalone module

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit df32c289233cf6dce456750c78f80cb2d6c3b58f
Author: Carsten Ziegeler 
AuthorDate: Tue May 14 08:01:43 2013 +

Create new standalone module

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1482242 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 16 
 1 file changed, 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7f2dd7..a6f875e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,10 +46,6 @@
 
 
 org.apache.felix
-maven-scr-plugin
-
-
-org.apache.felix
 maven-bundle-plugin
 true
 
@@ -57,20 +53,8 @@
 
 
 
-org.apache.felix
-org.apache.felix.scr.annotations
-
-
 biz.aQute
 bndlib
 
-
-org.osgi
-org.osgi.core
-
-
-org.osgi
-org.osgi.compendium
-
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 15/39: Update to latest parent pom

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 9e85ec4bee63b86cba7d4084c63aac43f58ace93
Author: Carsten Ziegeler 
AuthorDate: Fri Jul 19 07:04:15 2013 +

Update to latest parent pom

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1504788 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a6f875e..907c7ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-16
+17
 ../../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 29/39: SLING-4684 : Stress that handleTopologyEvent() should be lock-free and terminate quickly

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 709f9a771b8206cf02a9022cc1e8268552c7b6fd
Author: Stefan Egli 
AuthorDate: Thu Apr 30 10:25:07 2015 +

SLING-4684 : Stress that handleTopologyEvent() should be lock-free and 
terminate quickly

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676949 
13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/TopologyEventListener.java | 4 
 1 file changed, 4 insertions(+)

diff --git 
a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java 
b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
index 8e199ce..71e1ff2 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
@@ -34,6 +34,10 @@ public interface TopologyEventListener {
 * Inform the service about an event in the topology - or in the 
discovery
 * of the topology.
 * 
+* Implementors of this method must ensure that this method returns 
quickly
+* and that no locks are being acquired that could cause deadlocks (ie 
the
+* framework might call this method holding locks).
+* 
 * The TopologyEvent contains details about what changed.
 * The supported event types are:
 * 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-discovery-api] 26/39: SLING-4668 : following clarifying note added to getId: 'Addition in 1.0.4: this id must consist only of alphanumeric characters plus dash '-' and undersco

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit c6ce72cedd331faabe85240016a073f8024971b6
Author: Stefan Egli 
AuthorDate: Mon Apr 27 13:12:03 2015 +

SLING-4668 : following clarifying note added to getId: 'Addition in 1.0.4: 
this id must consist only of alphanumeric characters plus dash '-' and 
underscore '_'.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676252 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/discovery/ClusterView.java| 63 +++---
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java 
b/src/main/java/org/apache/sling/discovery/ClusterView.java
index f50612b..3914fcf 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -31,27 +31,30 @@ import aQute.bnd.annotation.ProviderType;
 @ProviderType
 public interface ClusterView {
 
-   /**
-* Returns a stable id of the cluster represented by this
-* cluster view.
-* 
-* Similar to the SlingID, this id is persisted and thus
-* remains stable accross instance/cluster restarts.
-* 
-* When an instance joins a cluster, it will inherit
-* the id from the joined cluster (thus incurs a cluster id
-* change).
-* 
-* Note: When instances part from a cluster (eg due to a network
-* partitioning) the cluster id is retained. This results in
-* potentially multiple clusters with the same id. This 
-* fact could be used to detect such partitioning/split brain
-* situations. It also implies though that the cluster id
-* is not guaranteed to be unique in a topology!
-* @return an id of this cluster view
-* @see http://issues.apache.org/jira/browse/SLING-3164;>SLING-3164
-* @since exists since 1.0.0 - stable since 1.0.2
-*/
+/**
+ * Returns a stable id of the cluster represented by this
+ * cluster view.
+ * 
+ * Similar to the SlingID, this id is persisted and thus
+ * remains stable accross instance/cluster restarts.
+ * 
+ * When an instance joins a cluster, it will inherit
+ * the id from the joined cluster (thus incurs a cluster id
+ * change).
+ * 
+ * Note: When instances part from a cluster (eg due to a network
+ * partitioning) the cluster id is retained. This results in
+ * potentially multiple clusters with the same id. This 
+ * fact could be used to detect such partitioning/split brain
+ * situations. It also implies though that the cluster id
+ * is not guaranteed to be unique in a topology!
+ * 
+ * Addition in 1.0.4: this id must consist only of alphanumeric
+ * characters plus dash '-' and underscore '_'.
+ * @return an id of this cluster view
+ * @see http://issues.apache.org/jira/browse/SLING-3164;>SLING-3164
+ * @since exists since 1.0.0 - stable since 1.0.2 - alphanumeric + '_' 
and'-' since 1.0.4
+ */
 String getId();
 
 /**
@@ -64,14 +67,14 @@ public interface ClusterView {
  */
 List getInstances();
 
-   /**
-* Provides the InstanceDescription belonging to the leader instance.
-* 
-* Every ClusterView is guaranteed to have one and only one leader.
-* 
-* The leader is stable: once a leader is elected it stays leader
-* unless it leaves the cluster (due to shutdown/crash/network problems)
-* @return the InstanceDescription belonging to the leader instance
-*/
+/**
+ * Provides the InstanceDescription belonging to the leader instance.
+ * 
+ * Every ClusterView is guaranteed to have one and only one leader.
+ * 
+ * The leader is stable: once a leader is elected it stays leader
+ * unless it leaves the cluster (due to shutdown/crash/network problems)
+ * @return the InstanceDescription belonging to the leader instance
+ */
 InstanceDescription getLeader();
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 18/34: SLING-6578 use dedicated service property "validator.id" for referencing the validator from models

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 3d5a8f655307f90316e971500b8d0d4514ef01a3
Author: Konrad Windszus 
AuthorDate: Thu Mar 2 07:14:34 2017 +

SLING-6578 use dedicated service property "validator.id" for referencing 
the validator from models

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785073 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/SLING-CONTENT/apps/sling/validation/models/model1.json| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json 
b/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
index c7a70be..008025c 100644
--- a/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
+++ b/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
@@ -11,7 +11,7 @@
 "propertyType": "string",
 "validators": {
 "jcr:primaryType" : "nt:unstructured",
-"org.apache.sling.validation.impl.validators.RegexValidator": {
+"org.apache.sling.validation.core.RegexValidator": {
 "jcr:primaryType" : "nt:unstructured",
 "validatorArguments" : ["regex=^\\\p{Upper}+$"],
 "severity" : "10"

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-extensions-webconsolesecurityprovider] branch master created (now 5591cd4)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-extensions-webconsolesecurityprovider.git.


  at 5591cd4  SLING-7167 Adjust READMEs

This branch includes the following new commits:

 new a8f8f35  SLING-1670 add repository based security provider for the Web 
Console
 new 7f3fb35  SLING-1650 JavaDoc
 new 0d9f2a4  Fix license header
 new 9a31a3a  Prevent JavaDoc reporting to run (nothing to JavaDoc here) 
and refer to the JIRA version ID for the changes plugin
 new d04e547  [maven-release-plugin] prepare release 
org.apache.sling.extensions.webconsolesecurityprovider-1.0.0
 new 9c358ba  [maven-release-plugin] prepare for next development iteration
 new bb26035  updating all modules to parent 10-SNAPSHOT in anticipation of 
emma additions to parent
 new 1971bbf  fixing relativePaths
 new db1baab  SLING-1869 - upgrading to latest SCR plugin and putting 
scr.annotations in parent
 new a5240cf  Update to recent snapshots
 new 06d1d26  Use latest releases.
 new 7a178eb  SLING-2150 : Update plugins to use the latest available 
versions
 new a772544  Update to recent snapshot
 new fe8838b  Using latest released parent pom
 new 3bc56ff  SLING-2187 - adding new module to contain our custom notice 
file; adding remote-resources plugin configuration to parent pom and removing 
all existing appended-resources NOTICE files
 new ef64c9c  temporarily using snapshots during release vote
 new 1ec5bb7  using latest releases
 new d86dd97  SLING-2480 : Add config for maven-sling-plugin to m2e 
configuration
 new 0c1d0dc  Update to latest parent pom
 new 774eba3  Use released versions
 new 04104a0  Use latest releases and update to new parent pom
 new 286fb86  Update to latest parent pom and use latest releases in 
launchpad
 new 098f75e  Correct reactor pom and update to parent pom 16
 new b3e5b7f  Update to latest parent pom
 new 5270bd9  SLING-3023 - catch and report Exception
 new bdef8ac  Update to parent pom 18
 new 4888700  SLING-3193 : Implement WebConsoleSecurityProvider2 for 
integration with Sling Authenticator
 new b962432  [maven-release-plugin] prepare release 
org.apache.sling.extensions.webconsolesecurityprovider-1.1.0
 new 00ff850  [maven-release-plugin] prepare for next development iteration
 new 451cadc  SLING-3271 : Make Sling imports dynamic
 new aace866  SLING-3272 : Only register security provider 2 if startup is 
finished
 new 765f28f  SLING-3273 : Switch to login page if user is not allowed to 
access the web console
 new 98558d2  SLING-3273 : Switch to login page if user is not allowed to 
access the web console
 new f249323  SLING-3273 : Switch to login page if user is not allowed to 
access the web console
 new 97e157f  [maven-release-plugin] prepare release 
org.apache.sling.extensions.webconsolesecurityprovider-1.1.2
 new 3cdabde  [maven-release-plugin] prepare for next development iteration
 new 0c3711c  Update to parent pom v19
 new 3d3ee37  Updated to parent version 20
 new dab11fc  SLING-3945 : NoClassDefFound if security provider starts 
without auth api available
 new 46b73fa  [maven-release-plugin] prepare release 
org.apache.sling.extensions.webconsolesecurityprovider-1.1.4
 new 888d7c0  [maven-release-plugin] prepare for next development iteration
 new a24db65  Update to Sling Parent POM 22 with baselining enabled
 new 034801c  SLING-4698 - Set parent.relativePath to empty for all modules
 new 45ae0c2  Update to Sling Parent 23
 new cedd91f  set parent version to 24 and add empty relativePath where 
missing
 new 9a830ba  SLING-4956 - Endless redirect loop if the logged in user 
tries to access the system console without enough privileges
 new 488e53b  [maven-release-plugin] prepare release 
org.apache.sling.extensions.webconsolesecurityprovider-1.1.6
 new e3401e2  [maven-release-plugin] prepare for next development iteration
 new d277fe9  Update the main reactor to parent 25
 new 660f403  Switch to parent pom 26
 new 1eff8cf  SLING-6234 : Web Console Security Provider should supprt 
logout
 new c63552c  [maven-release-plugin] prepare release 
org.apache.sling.extensions.webconsolesecurityprovider-1.2.0
 new 84883c8  [maven-release-plugin] prepare for next development iteration
 new a214c9b  [maven-release-plugin] prepare release 
org.apache.sling.extensions.webconsolesecurityprovider-1.2.0
 new bf21bb2  [maven-release-plugin] prepare for next development iteration
 new 99c0941  Clean up code
 new 25b05b6  use Sling Parent 30
 new 5591cd4  SLING-7167 Adjust READMEs

The 58 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already 

[sling-org-apache-sling-repoinit-parser] 32/46: SLING-6422 - add restrictions to the full example, will use them for the website docs

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-parser.git

commit 7456e539cc433321b022ee0f4d9e6e3edbd313eb
Author: Bertrand Delacretaz 
AuthorDate: Tue Jun 13 13:59:50 2017 +

SLING-6422 - add restrictions to the full example, will use them for the 
website docs

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1798603 
13f79535-47bb-0310-9956-ffa450edef68
---
 src/test/resources/testcases/test-99-output.txt | 5 +
 src/test/resources/testcases/test-99.txt| 7 +++
 2 files changed, 12 insertions(+)

diff --git a/src/test/resources/testcases/test-99-output.txt 
b/src/test/resources/testcases/test-99-output.txt
index eaa7451..a4fd1c9 100644
--- a/src/test/resources/testcases/test-99-output.txt
+++ b/src/test/resources/testcases/test-99-output.txt
@@ -16,6 +16,11 @@ SetAclPrincipals for alice bob fred
   AclLine ALLOW {paths=[/content, /var], privileges=[jcr:read]}
   AclLine DENY {paths=[/content/example.com], privileges=[jcr:write]}
   AclLine DENY {nodetypes=[example:Page], paths=[/], privileges=[jcr:all]}
+SetAclPrincipals for restrictions_examples 
+  AclLine DENY {nodetypes=[sling:Folder, nt:unstructured], paths=[/apps, 
/content], privileges=[jcr:modifyProperties]} 
restrictions=[rep:itemNames=[prop1, prop2]]
+  AclLine ALLOW {paths=[/apps], privileges=[jcr:addChildNodes]} 
restrictions=[rep:ntNames=[sling:Folder, nt:unstructured]]
+  AclLine ALLOW {paths=[/apps], privileges=[jcr:modifyProperties]} 
restrictions=[rep:ntNames=[sling:Folder, nt:unstructured], 
rep:itemNames=[prop1, prop2]]
+  AclLine ALLOW {paths=[/apps, /content], privileges=[jcr:addChildNodes]} 
restrictions=[rep:glob=[/cat/*, */cat, *cat/*]]
 RegisterNamespace (NSprefix) uri:someURI/v1.42
 RegisterNodetypes:
 

[sling-org-apache-sling-validation-test-services] 25/34: SLING-6515 provide a PostProcessor which validates the newly generated resouce

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit e2f24382f02061c267de1e69ac0b8a0bbf335c7b
Author: Konrad Windszus 
AuthorDate: Wed Mar 29 09:12:37 2017 +

SLING-6515 provide a PostProcessor which validates the newly generated 
resouce

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1789300 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/SLING-CONTENT/apps/sling/validation/models/model1.json   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json 
b/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
index 008025c..4a0fc61 100644
--- a/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
+++ b/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
@@ -1,7 +1,8 @@
 {
 "validatedResourceType": "validation/test/resourceType1",
 "applicablePaths": [
-"/validation/testing/fakeFolder1"
+"/validation/testing/fakeFolder1",
+   "/content/validated"
 ],
 "sling:resourceType": "sling/validation/model",
 "properties": {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-settings] branch master created (now 4bd6575)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git.


  at 4bd6575  SLING-7167 Adjust READMEs

This branch includes the following new commits:

 new 43dc567  SLING-1460 : Move SlingSettingsService to new Settings bundle
 new fae7089  SLING-1651 - Integrate RunMode module into new Settings 
Module SLING-983 - Add sling.properties file to configuration status page
 new 278b716  SLING-1651 - Integrate RunMode module into new Settings 
Module SLING-983 - Add sling.properties file to configuration status page
 new edfdcc9  Don't delete sling id file in engine for compatibility and 
add a temporary np check
 new 8b3dd29  Delayed activation if engine bundle is available but not 
started yet.
 new f64af5e  Some pom formatting, set export version and make dependencies 
provided
 new 9bf184a  Add site generation properties and Bundle-DocURL manifest 
header
 new e57ff15  [maven-release-plugin] prepare release 
org.apache.sling.settings-1.0.0
 new 1be896a  [maven-release-plugin] prepare for next development iteration
 new 099bd8c  Add README.txt
 new 031b40d  SLING-1835 : Remove direct dependency to web console by using 
new configuration printer support
 new 1f3811d  [maven-release-plugin] prepare release 
org.apache.sling.settings-1.0.2
 new 92e4da0  [maven-release-plugin] prepare for next development iteration
 new 6ae926a  updating all modules to parent 10-SNAPSHOT in anticipation of 
emma additions to parent
 new f786aac  Update to recent snapshots
 new f189937  Use latest releases.
 new 8d44936  SLING-1970 : Potential deadlock during start of settings 
service
 new 5273818  SLING-2089 - adding getAbsolutePathWithinSlingHome() method
 new 14fb22f  SLING-2150 : Update plugins to use the latest available 
versions
 new 27e4ce1  SLING-2155 : Remove check for Sling Engine bundle
 new 093eeae  Update to recent snapshot
 new 3fed5c9  Using latest released parent pom
 new d723f2b  SLING-2187 - adding new module to contain our custom notice 
file; adding remote-resources plugin configuration to parent pom and removing 
all existing appended-resources NOTICE files
 new 1f5e627  temporarily using snapshots during release vote
 new 679d74f  using latest releases
 new c143e2b  [maven-release-plugin] prepare release 
org.apache.sling.settings-1.1.0
 new 19956c4  [maven-release-plugin] prepare for next development iteration
 new 84e8832  SLING-2480 : Add config for maven-sling-plugin to m2e 
configuration
 new 630e886  Remove old scr javadoc annotation
 new 1899e6a  Update to latest parent pom
 new f024904  Use released versions
 new ad708d8  SLING-2662 :  Enhance run mode handling
 new 7cc931d  SLING-2662 :  Enhance run mode handling
 new 83708f1  SLING-2662 - more readable tests and some additional ones
 new 43c84c5  [maven-release-plugin] prepare release 
org.apache.sling.settings-1.2.0
 new ea9d9a3  [maven-release-plugin] prepare for next development iteration
 new 800725f  SLING-2662 - test case with empty run modes string
 new 5fe9030  SLING-2673 - close fis stream
 new dfce75f  SLING-2674 - take new run mode options into account when 
starting on an older Sling instance
 new dd853d2  SLING-2674: SlingSettingsServiceImpl should detect and handle 
upgrades
 new 40f3a0a  Support portals bridge
 new b3bbeb5  SLING-2674 :  SlingSettingsServiceImpl should detect and 
handle upgrades
 new 005aaf1  [maven-release-plugin] prepare release 
org.apache.sling.settings-1.2.2
 new ae117b8  [maven-release-plugin] prepare for next development iteration
 new 0e1818c  Use latest releases and update to new parent pom
 new c333940  Update to latest parent pom and use latest releases in 
launchpad
 new 8b58ac9  Correct reactor pom and update to parent pom 16
 new 063ed65  Update to latest parent pom
 new d096d71  SLING-2976 :  Add support for instance name and description
 new 8d16452  SLING-2976 :  Add support for instance name and description
 new dd23e9f  [maven-release-plugin] prepare release 
org.apache.sling.settings-1.3.0
 new 7272abb  [maven-release-plugin] prepare for next development iteration
 new e0ec462  Update to parent pom 18
 new 321b2e8  Revert to old maven bundle plugin if DynamicImport-Package is 
used
 new de853fb  SLING-3286 - Remove plugin version overrides from poms
 new e71fc80  SLING-3286 - Remove plugin version overrides from poms
 new d2be770  Update to parent pom v19
 new ec8e4be  SLING-3737 : Instance Sling Identifier may be randomly reset 
on restart. Apply patch from Timothee Maret
 new 87fd0a8  [maven-release-plugin] prepare release 
org.apache.sling.settings-1.3.2
 new e9edf2c  [maven-release-plugin] prepare for next 

[sling-org-apache-sling-validation-test-services] 06/34: Update to Sling Parent 23

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 805d18664dba8020b18c7c5a6ecc0a1bad867bd5
Author: Robert Munteanu 
AuthorDate: Thu Jun 25 13:08:16 2015 +

Update to Sling Parent 23

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a09cb2b..8372fc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.sling
 sling
-22
+23
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 30/34: [maven-release-plugin] prepare release org.apache.sling.validation.test-services-1.0.0

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 79a02946c8b78270db43900c3c9cd886b2d68637
Author: Konrad Windszus 
AuthorDate: Wed Apr 5 13:32:54 2017 +

[maven-release-plugin] prepare release 
org.apache.sling.validation.test-services-1.0.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1790250 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 21e3b01..5a76963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,15 +27,15 @@
 
 
 org.apache.sling.validation.test-services
-1.0.0-SNAPSHOT
+1.0.0
 bundle
 
 Apache Sling Validation Framework Testing Services
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services
- 
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services
-
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/test-services
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.validation.test-services-1.0.0
+ 
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.validation.test-services-1.0.0
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.validation.test-services-1.0.0
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 17/24: use Sling Parent 30

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 0236b13ca3de7b5998b8fe2af2b351587f30ac83
Author: Oliver Lietz 
AuthorDate: Mon Mar 6 10:22:30 2017 +

use Sling Parent 30

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785621 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c783827..fd835f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.sling
 sling
-29
+30
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 04/24: set path to parent pom

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 123e7327f4def53fc3bc28c724ea16fd36ead03d
Author: Oliver Lietz 
AuthorDate: Sun Apr 19 21:14:14 2015 +

set path to parent pom

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1674700 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 71a105b..7eee172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 org.apache.sling
 sling
 23-SNAPSHOT
-
+../../../../parent/pom.xml
 
 
 org.apache.sling.validation.examples

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 22/34: remove resource presence and presenter

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 6bec3a9f12ba14d4c70c0ddf4cd9e3ba002a0335
Author: Oliver Lietz 
AuthorDate: Sat Mar 18 15:42:01 2017 +

remove resource presence and presenter

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1787571 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../validation/testservices/ResourcePresence.java  |  26 
 .../testservices/internal/ResourcePresenter.java   | 131 -
 2 files changed, 157 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ResourcePresence.java 
b/src/main/java/org/apache/sling/validation/testservices/ResourcePresence.java
deleted file mode 100644
index 6a414a1..000
--- 
a/src/main/java/org/apache/sling/validation/testservices/ResourcePresence.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.validation.testservices;
-
-import org.osgi.annotation.versioning.ProviderType;
-
-@ProviderType
-public interface ResourcePresence {
-
-}
diff --git 
a/src/main/java/org/apache/sling/validation/testservices/internal/ResourcePresenter.java
 
b/src/main/java/org/apache/sling/validation/testservices/internal/ResourcePresenter.java
deleted file mode 100644
index 7043488..000
--- 
a/src/main/java/org/apache/sling/validation/testservices/internal/ResourcePresenter.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * 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.validation.testservices.internal;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import org.apache.sling.api.resource.LoginException;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.api.resource.observation.ResourceChange;
-import org.apache.sling.api.resource.observation.ResourceChangeListener;
-import org.apache.sling.validation.testservices.ResourcePresence;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Reference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Component(
-service = ResourceChangeListener.class,
-immediate = true,
-property = {
-"resource.paths=/apps/sling/validation"
-}
-)
-public class ResourcePresenter implements ResourceChangeListener {
-
-@Reference
-private ResourceResolverFactory resourceResolverFactory;
-
-private ServiceRegistration model;
-
-private DefaultResourcePresence resourcePresence = new 
DefaultResourcePresence("/apps/sling/validation/models/model1");
-
-private BundleContext bundleContext;
-
-private final Logger logger = 
LoggerFactory.getLogger(ResourcePresenter.class);
-
-@Activate
-public void activate(final BundleContext bundleContext) {
-this.bundleContext = bundleContext;
-try (final ResourceResolver resourceResolver = 

[sling-org-apache-sling-validation-test-services] 34/34: SLING-7167 Adjust READMEs

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 1d690aa741fa918c297dc6884cefd0cdaf7de546
Author: Oliver Lietz 
AuthorDate: Tue Oct 3 09:24:43 2017 +

SLING-7167 Adjust READMEs

add missing README

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810710 
13f79535-47bb-0310-9956-ffa450edef68
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 000..48ee7ed
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Apache Sling Validation Framework Testing Services
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 05/24: Use latest parent pom

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit bf2c39177e175925334ccc8aab293dc4e5413434
Author: Carsten Ziegeler 
AuthorDate: Mon Apr 27 16:34:19 2015 +

Use latest parent pom

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676331 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7eee172..c444b6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.sling
 sling
-23-SNAPSHOT
+22
 ../../../../parent/pom.xml
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 15/24: SLING-4213 leverage sling-i18n for validation failure messages

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit a12e67fdce4259d61b6ed23c3413633626c71e41
Author: Konrad Windszus 
AuthorDate: Fri Jan 8 08:51:00 2016 +

SLING-4213 leverage sling-i18n for validation failure messages

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1723664 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/validation/examples/servlets/ModifyUserServlet.java | 3 ++-
 .../resources/SLING-INF/apps/validationdemo/components/user/user.jsp | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
 
b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
index d74657f..b3a832f 100644
--- 
a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
+++ 
b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
@@ -20,6 +20,7 @@ package org.apache.sling.validation.examples.servlets;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.ServletException;
@@ -74,7 +75,7 @@ public class ModifyUserServlet extends SlingAllMethodsServlet 
{
 JSONArray failures = new JSONArray();
 for (ValidationFailure failure : vr.getFailures()) {
 JSONObject failureJson = new JSONObject();
-failureJson.put("message", failure.getMessage());
+failureJson.put("message", 
failure.getMessage(request.getResourceBundle(Locale.US)));
 failureJson.put("location", failure.getLocation());
 failures.put(failureJson);
 }
diff --git 
a/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp 
b/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
index bfca1ef..cda6478 100644
--- a/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
+++ b/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
@@ -18,6 +18,7 @@
 --><%@page session="false" import="
 java.util.Map,
 java.util.List,
+java.util.Locale,
 org.apache.sling.api.resource.Resource,
 org.apache.sling.validation.ValidationFailure,
 org.apache.sling.validation.examples.models.UserModel
@@ -49,8 +50,8 @@
 <%
 for (ValidationFailure error : user.getErrors()) {
 %>
-Key: <%= error.getLocation() %>
-<%= error.getMessage() %>
+Location: <%= error.getLocation() %>
+<%= error.getMessage(slingRequest.getResourceBundle(Locale.US)) 
%>
 <%
 }
 %>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 19/34: use Sling Parent 30

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 8f99dea5d7a7b180e2735b68175b4ea245e097bb
Author: Oliver Lietz 
AuthorDate: Mon Mar 6 10:22:30 2017 +

use Sling Parent 30

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785621 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d386827..23d27ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.sling
 sling
-29
+30
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 09/34: SLING-4876 support resource type inheritance for validator models

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 09ac45ba12043f7375d927b52d5f3f503c3e570b
Author: Konrad Windszus 
AuthorDate: Wed Jul 29 07:22:46 2015 +

SLING-4876 support resource type inheritance for validator models

This closes #100

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1693191 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/validation/testservices/ValidationPostOperation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
index 2866318..84faec2 100644
--- 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
+++ 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
@@ -64,7 +64,7 @@ public class ValidationPostOperation extends 
AbstractPostOperation {
 }
 if (resourceType != null && !"".equals(resourceType)) {
 String resourcePath = 
request.getRequestPathInfo().getResourcePath();
-ValidationModel vm = 
validationService.getValidationModel(resourceType, resourcePath);
+ValidationModel vm = 
validationService.getValidationModel(resourceType, resourcePath, false);
 if (vm != null) {
 ValidationResult vr = 
validationService.validate(requestParameters, vm);
 vpr.setValidationResult(vr);

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 14/34: SLING-5373 allow to set severity per validator in the model

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit a6c6b7362b03fe83871cd649710db30a716c22d6
Author: Konrad Windszus 
AuthorDate: Fri Mar 11 11:13:32 2016 +

SLING-5373 allow to set severity per validator in the model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1734530 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/validation/testservices/ValidationPostResponse.java   | 1 +
 .../resources/SLING-CONTENT/apps/sling/validation/models/model1.json   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
index 8cd45d8..c023f0e 100644
--- 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
+++ 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
@@ -62,6 +62,7 @@ public class ValidationPostResponse extends 
AbstractPostResponse {
 JSONObject failureJson = new JSONObject();
 failureJson.put("message", 
failure.getMessage(resourceBundle));
 failureJson.put("location", failure.getLocation());
+failureJson.put("severity", failure.getSeverity());
 failures.put(failureJson);
 }
 jsonResponse.put("failures", failures);
diff --git 
a/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json 
b/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
index 85ad3bc..c7a70be 100644
--- a/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
+++ b/src/main/resources/SLING-CONTENT/apps/sling/validation/models/model1.json
@@ -13,7 +13,8 @@
 "jcr:primaryType" : "nt:unstructured",
 "org.apache.sling.validation.impl.validators.RegexValidator": {
 "jcr:primaryType" : "nt:unstructured",
-"validatorArguments" : ["regex=^\\\p{Upper}+$"]
+"validatorArguments" : ["regex=^\\\p{Upper}+$"],
+"severity" : "10"
 }
 }
 },

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 09/24: Remove superflous sling.java.version=6 as it's the default now

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit a3f159c978f57719eded25215272880e2762818b
Author: Robert Munteanu 
AuthorDate: Thu Jun 25 13:14:53 2015 +

Remove superflous sling.java.version=6 as it's the default now

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687505 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 186d4c0..6462e8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,10 +35,6 @@
 Apache Sling Validation Framework Examples
 Demo Examples for the Apache Sling Validation 
Framework
 
-
-6
-
-
 
 
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/examples
  
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/examples

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 01/24: SLING 4606 move validation from contrib to /

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 73d0803df20e7e44a003e9d9fc27d782dcce0db5
Author: Konrad Windszus 
AuthorDate: Fri Apr 10 13:22:08 2015 +

SLING 4606 move validation from contrib to /

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1672647 
13f79535-47bb-0310-9956-ffa450edef68
---
 README.md  |  26 
 pom.xml| 141 +
 .../validation/examples/models/UserModel.java  |  91 +
 .../examples/servlets/ModifyUserServlet.java   |  92 ++
 src/main/resources/SLING-INF/apps/sling.json   |   3 +
 .../resources/SLING-INF/apps/sling/validation.json |   3 +
 .../SLING-INF/apps/sling/validation/models.json|   3 +
 .../apps/sling/validation/models/user.admin.json   |  57 +
 .../apps/sling/validation/models/user.regular.json |  44 +++
 .../resources/SLING-INF/apps/validationdemo.json   |   3 +
 .../SLING-INF/apps/validationdemo/components.json  |   3 +
 .../apps/validationdemo/components/user.json   |   3 +
 .../apps/validationdemo/components/user/user.jsp   |  42 ++
 .../content/validationdemo/users/admin/neo.json|  11 ++
 .../content/validationdemo/users/johnsmith.json|   8 ++
 15 files changed, 530 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 000..1bc89a7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+## How To Run the Examples
+1. Start a Sling launchpad
+2. Install the `org.apache.sling.validation.api` and 
`org.apache.sling.validation.core` bundles:
+
+```bash
+cd ../api
+mvn clean package sling:install
+cd ../core
+mvn clean package sling:install
+cd ../examples
+mvn clean package sling:install
+```
+
+## Invalid POST request
+```bash
+curl -u admin:admin -Fsling:resourceType=/apps/validationdemo/components/user 
-Fusername=johnsmith -FfirstName=John204 -FlastName=Smith 
http://127.0.0.1:8080/content/validationdemo/users/johnsmith.modify.html
+```
+
+Check that the resource has not been modified at 
http://127.0.0.1:8080/content/validationdemo/users/johnsmith.html.
+
+## Valid POST request
+```bash
+curl -u admin:admin -Fsling:resourceType=/apps/validationdemo/components/user 
-Fusername=johnsmith -FfirstName=Johnny -FlastName=Bravo 
http://127.0.0.1:8080/content/validationdemo/users/johnsmith.modify.html
+```
+
+Check that the resource has been modified at 
http://127.0.0.1:8080/content/validationdemo/users/johnsmith.html.
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000..ae1b515
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,141 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+org.apache.sling
+sling
+15
+
+
+4.0.0
+
+org.apache.sling.validation.examples
+1.0.0-SNAPSHOT
+bundle
+
+Apache Sling Validation Framework Examples
+Demo Examples for the Apache Sling Validation 
Framework
+
+
+6
+
+
+
+
+
+org.apache.felix
+maven-scr-plugin
+1.11.0
+
+
+generate-scr-descriptor
+
+scr
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+true
+
+
+
+org.apache.sling.validation.examples.*
+
+
+
org.apache.sling.validation.examples.models;version=1.0.0
+
+
org.apache.sling.validation.examples.models
+
SLING-INF;
+
+
+
+
+
+
+
+org.apache.sling
+org.apache.sling.validation.api
+1.0.0-SNAPSHOT
+provided
+
+
+javax.servlet
+servlet-api
+provided
+
+
+org.osgi
+org.osgi.compendium
+provided
+
+
+org.osgi
+org.osgi.core
+provided
+
+
+javax.jcr
+jcr
+2.0
+provided
+
+
+org.apache.sling
+org.apache.sling.api
+2.4.2
+provided
+
+
+org.slf4j
+

[sling-org-apache-sling-validation-examples] 03/24: SLING-4609 more null annotations

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 9f0191d20249e53964efaedfccc43f874951d709
Author: Konrad Windszus 
AuthorDate: Tue Apr 14 14:19:49 2015 +

SLING-4609 more null annotations

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1673430 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml   |  2 +-
 .../apps/validationdemo/components/user/user.jsp  | 19 ++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d501ab3..71a105b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.sling
 sling
-22
+23-SNAPSHOT
 
 
 
diff --git 
a/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp 
b/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
index 5c585cb..26e1968 100644
--- a/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
+++ b/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
@@ -1,4 +1,21 @@
-<%@page session="false" import="
+<%@page session="false" import="
 java.util.Map,
 java.util.List,
 org.apache.sling.api.resource.Resource,

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 02/34: use newest parent, get rid of JCR dependency, clean up POMs

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 47c4519ebf79b8af69a5de580ec00e9ec86e895a
Author: Konrad Windszus 
AuthorDate: Sat Apr 11 17:54:36 2015 +

use newest parent, get rid of JCR dependency, clean up POMs

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1672911 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml| 29 +++---
 .../testservices/ValidationPostOperation.java  | 11 +++-
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index f484157..005de3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,12 @@
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
 
 org.apache.sling
 sling
-15
-
+22
 
-4.0.0
 
 org.apache.sling.validation.test-services
 1.0.0-SNAPSHOT
@@ -37,21 +36,18 @@
 
 6
 
+
+
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services
+ 
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core
+
 
 
 
 
 org.apache.felix
 maven-scr-plugin
-1.11.0
-
-
-generate-scr-descriptor
-
-scr
-
-
-
 
 
 org.apache.felix
@@ -91,7 +87,6 @@
 
 org.apache.felix
 org.apache.felix.scr.annotations
-1.9.0
 provided
 
 
@@ -106,6 +101,12 @@
 2.2.0
 provided
 
+
+
+javax.jcr
+jcr
+2.0
+
 
 org.apache.sling
 org.apache.sling.validation.api
@@ -127,7 +128,7 @@
 
 org.apache.sling
 org.apache.sling.commons.testing
-2.0.14
+2.0.16
 test
 
 
diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
index 408c058..c350cea 100644
--- 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
+++ 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.validation.testservices;
 
+import java.util.List;
+
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
@@ -25,7 +27,6 @@ import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.commons.json.JSONObject;
 import org.apache.sling.servlets.post.AbstractPostOperation;
 import org.apache.sling.servlets.post.Modification;
 import org.apache.sling.servlets.post.PostOperation;
@@ -36,16 +37,12 @@ import org.apache.sling.validation.api.ValidationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jcr.RepositoryException;
-import java.util.List;
-
 @Component()
 @Service(PostOperation.class)
 @Properties({
 @Property(
 name = PostOperation.PROP_OPERATION_NAME,
-value = "validation",
-propertyPrivate = true
+value = "validation"
 )
 })
 public class ValidationPostOperation extends AbstractPostOperation {
@@ -56,7 +53,7 @@ public class ValidationPostOperation extends 
AbstractPostOperation {
 private ValidationService validationService;
 
 @Override
-protected void doRun(SlingHttpServletRequest request, PostResponse 
response, List changes) throws RepositoryException {
+protected void doRun(SlingHttpServletRequest request, PostResponse 
response, List changes) {
 if (response instanceof ValidationPostResponse) {
 ValidationPostResponse vpr = (ValidationPostResponse) response;
 ValueMap requestParameters = request.adaptTo(ValueMap.class);

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 23/34: prevent overwriting of parts of the repository which are not affected by test content

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 428bbda0a69370e4627c4ff397e228175278dcbe
Author: Konrad Windszus 
AuthorDate: Thu Mar 23 13:48:17 2017 +

prevent overwriting of parts of the repository which are not affected by 
test content

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1788240 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 72cd222..9988adf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 true
 
 
-
SLING-CONTENT;overwrite:=true
+
SLING-CONTENT/apps/sling/validation;overwrite:=true;path=/apps/sling/validation
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 03/34: Set relative path

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit a7b9915394f3d40148feab4d4f9d28baad4297f7
Author: Carsten Ziegeler 
AuthorDate: Wed Apr 15 07:58:51 2015 +

Set relative path

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1673672 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 005de3b..a09cb2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
 org.apache.sling
 sling
 22
+
 
 
 org.apache.sling.validation.test-services

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 13/24: SLING-5026 - refactor validator interface to allow to set multiple failure messages

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 52e4c8bbcda4e9e8e5865ada464e475adf7eb762
Author: Konrad Windszus 
AuthorDate: Fri Dec 18 14:50:39 2015 +

SLING-5026 - refactor validator interface to allow to set multiple failure 
messages

This closes #117

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1720802 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/validation/examples/models/UserModel.java |  9 +
 .../validation/examples/servlets/ModifyUserServlet.java | 17 -
 .../apps/validationdemo/components/user/user.jsp| 11 ---
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/validation/examples/models/UserModel.java 
b/src/main/java/org/apache/sling/validation/examples/models/UserModel.java
index f07c430..5cff7c3 100644
--- a/src/main/java/org/apache/sling/validation/examples/models/UserModel.java
+++ b/src/main/java/org/apache/sling/validation/examples/models/UserModel.java
@@ -18,7 +18,7 @@
  */
 package org.apache.sling.validation.examples.models;
 
-import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +27,7 @@ import javax.inject.Inject;
 
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Model;
+import org.apache.sling.validation.ValidationFailure;
 import org.apache.sling.validation.ValidationResult;
 import org.apache.sling.validation.ValidationService;
 import org.apache.sling.validation.model.ValidationModel;
@@ -37,7 +38,7 @@ public class UserModel {
 private static final String INVALID = "INVALID";
 
 private Resource resource;
-private Map errors = new HashMap();
+private List errors = new 
LinkedList();
 
 @Inject
 private ValidationService validationService;
@@ -74,7 +75,7 @@ public class UserModel {
 return isAdmin;
 }
 
-public Map getErrors() {
+public List getErrors() {
 return errors;
 }
 
@@ -84,7 +85,7 @@ public class UserModel {
 if (model != null) {
 ValidationResult result = validationService.validate(resource, 
model);
 if (!result.isValid()) {
-errors = result.getFailureMessages();
+errors = result.getFailures();
 }
 }
 }
diff --git 
a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
 
b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
index e7a3944..d74657f 100644
--- 
a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
+++ 
b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
@@ -34,6 +34,7 @@ import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.apache.sling.commons.json.JSONArray;
 import org.apache.sling.commons.json.JSONException;
 import org.apache.sling.commons.json.JSONObject;
+import org.apache.sling.validation.ValidationFailure;
 import org.apache.sling.validation.ValidationResult;
 import org.apache.sling.validation.ValidationService;
 import org.apache.sling.validation.model.ValidationModel;
@@ -70,16 +71,14 @@ public class ModifyUserServlet extends 
SlingAllMethodsServlet {
 JSONObject json = new JSONObject();
 try {
 json.put("success", false);
-JSONObject messages = new JSONObject();
-for (Map.Entry entry : 
vr.getFailureMessages().entrySet()) {
-String key = entry.getKey();
-JSONArray errors = new JSONArray();
-for (String message : entry.getValue()) {
-errors.put(message);
-}
-messages.put(key, errors);
+JSONArray failures = new JSONArray();
+for (ValidationFailure failure : vr.getFailures()) {
+JSONObject failureJson = new JSONObject();
+failureJson.put("message", failure.getMessage());
+failureJson.put("location", failure.getLocation());
+failures.put(failureJson);
 }
-json.put("messages", messages);
+json.put("failures", failures);
 response.getWriter().print(json.toString());
 response.setStatus(400);
 } catch (JSONException e) {
diff --git 
a/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp 

[sling-org-apache-sling-validation-examples] 24/24: SLING-7167 Adjust READMEs

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit ccdc6c47bc7c2862ff9f7858fb1505e6f823b814
Author: Oliver Lietz 
AuthorDate: Tue Oct 3 09:56:42 2017 +

SLING-7167 Adjust READMEs

add uniform header linking to Sling project

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810852 
13f79535-47bb-0310-9956-ffa450edef68
---
 README.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 1bc89a7..2ee0521 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+# Apache Sling Validation Framework Examples
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
+
 ## How To Run the Examples
 1. Start a Sling launchpad
 2. Install the `org.apache.sling.validation.api` and 
`org.apache.sling.validation.core` bundles:

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 12/34: Switch to parent pom 26

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 5b490a030291a6fecee8f0e6a1b5100103f6c6db
Author: Carsten Ziegeler 
AuthorDate: Sun Jan 3 14:07:46 2016 +

Switch to parent pom 26

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 891c214..0081deb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.sling
 sling
-25
+26
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 21/24: revert failed release 1.0.0

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 1732d433b5384bc04ab9ff8b17fcbadc57854edc
Author: Konrad Windszus 
AuthorDate: Wed Apr 5 13:19:26 2017 +

revert failed release 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1790242 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 040a688..f52ce72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 
 org.apache.sling.validation.examples
-1.0.1-SNAPSHOT
+1.0.0-SNAPSHOT
 bundle
 
 Apache Sling Validation Framework Examples

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 16/34: SLING-5590 Move Sling HTTP Servlet Request Adaptor Factory out of Validation Core

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 64ebfa7baa055373ba22e3b278eb3e30e175be3b
Author: Oliver Lietz 
AuthorDate: Thu Feb 2 15:34:58 2017 +

SLING-5590 Move Sling HTTP Servlet Request Adaptor Factory out of 
Validation Core

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1781406 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../testservices/ValidationPostOperation.java  | 45 +-
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
index 84faec2..a05008e 100644
--- 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
+++ 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
@@ -18,7 +18,10 @@
  */
 package org.apache.sling.validation.testservices;
 
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Properties;
@@ -26,7 +29,7 @@ import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.ValueMapDecorator;
 import org.apache.sling.servlets.post.AbstractPostOperation;
 import org.apache.sling.servlets.post.Modification;
 import org.apache.sling.servlets.post.PostOperation;
@@ -40,14 +43,14 @@ import org.slf4j.LoggerFactory;
 @Component()
 @Service(PostOperation.class)
 @Properties({
-@Property(
-name = PostOperation.PROP_OPERATION_NAME,
-value = "validation"
-)
+@Property(
+name = PostOperation.PROP_OPERATION_NAME,
+value = "validation"
+)
 })
 public class ValidationPostOperation extends AbstractPostOperation {
 
-private static final Logger LOG = 
LoggerFactory.getLogger(ValidationPostOperation.class);
+private final Logger logger = 
LoggerFactory.getLogger(ValidationPostOperation.class);
 
 @Reference
 private ValidationService validationService;
@@ -55,23 +58,29 @@ public class ValidationPostOperation extends 
AbstractPostOperation {
 @Override
 protected void doRun(SlingHttpServletRequest request, PostResponse 
response, List changes) {
 if (response instanceof ValidationPostResponse) {
-ValidationPostResponse vpr = (ValidationPostResponse) response;
-ValueMap requestParameters = request.adaptTo(ValueMap.class);
-String[] resourceTypeValues = 
requestParameters.get("sling:resourceType", String[].class);
-String resourceType = null;
-if (resourceTypeValues != null && resourceTypeValues.length > 0) {
-resourceType = resourceTypeValues[0];
+final Map base = new LinkedHashMap<>();
+final ValueMapDecorator valueMap = new ValueMapDecorator(base);
+final Enumeration names = request.getParameterNames();
+while (names.hasMoreElements()) {
+final String name = names.nextElement();
+valueMap.put(name, 
request.getRequestParameter(name).getString());
 }
+
+final String resourceType = 
request.getRequestParameter("sling:resourceType").getString();
 if (resourceType != null && !"".equals(resourceType)) {
-String resourcePath = 
request.getRequestPathInfo().getResourcePath();
-ValidationModel vm = 
validationService.getValidationModel(resourceType, resourcePath, false);
-if (vm != null) {
-ValidationResult vr = 
validationService.validate(requestParameters, vm);
-vpr.setValidationResult(vr);
+final String resourcePath = 
request.getRequestPathInfo().getResourcePath();
+final ValidationModel validationModel = 
validationService.getValidationModel(resourceType, resourcePath, false);
+if (validationModel != null) {
+final ValidationResult validationResult = 
validationService.validate(valueMap, validationModel);
+final ValidationPostResponse validationPostResponse = 
(ValidationPostResponse) response;
+
validationPostResponse.setValidationResult(validationResult);
 } else {
-LOG.error("No validation model for resourceType {} and 
resourcePath {} ", resourceType, resourcePath);
+logger.error("No 

[sling-org-apache-sling-validation-test-services] 21/34: clean up pom's for release

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit a758f3a1f339f52861f74f7859624127a7a79374
Author: Konrad Windszus 
AuthorDate: Thu Mar 16 14:53:52 2017 +

clean up pom's for release


git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1787198 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index bac3680..72cd222 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,15 +17,13 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 4.0.0
 
 org.apache.sling
 sling
 30
-
+
 
 
 org.apache.sling.validation.test-services

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 06/24: SLING-4698 - Set parent.relativePath to empty for all modules

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit e2fb4c0682016316af81df52c303fe25154d965d
Author: Robert Munteanu 
AuthorDate: Thu May 7 10:14:40 2015 +

SLING-4698 - Set parent.relativePath to empty for all modules

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c444b6b..d501ab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 org.apache.sling
 sling
 22
-../../../../parent/pom.xml
+
 
 
 org.apache.sling.validation.examples

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] branch master created (now ccdc6c4)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git.


  at ccdc6c4  SLING-7167 Adjust READMEs

This branch includes the following new commits:

 new 73d0803  SLING 4606 move validation from contrib to /
 new 89994ce  use newest parent, get rid of JCR dependency, clean up POMs
 new 9f0191d  SLING-4609 more null annotations
 new 123e732  set path to parent pom
 new bf2c391  Use latest parent pom
 new e2fb4c0  SLING-4698 - Set parent.relativePath to empty for all modules
 new 00759fc  SLING-4777 decouple model provider from the validation service
 new 3b8a306  Update to Sling Parent 23
 new a3f159c  Remove superflous sling.java.version=6 as it's the default now
 new 3a31eac  set parent version to 24 and add empty relativePath where 
missing
 new e2a7fe0  SLING-4876 support resource type inheritance for validator 
models
 new 91cc4c3  Update the main reactor to parent 25
 new 52e4c8b  SLING-5026 - refactor validator interface to allow to set 
multiple failure messages
 new 81e6d18  Switch to parent pom 26
 new a12e67f  SLING-4213 leverage sling-i18n for validation failure messages
 new 1b36fb8  use Sling parent 29
 new 0236b13  use Sling Parent 30
 new 23495c8  clean up pom's for release
 new 8e51b76  SLING-6727 ValidationModel.getValidatedResourceType -> 
ValidationModel.getValidatingResourceType
 new 4ee6aae  [maven-release-plugin] prepare for next development iteration
 new 1732d43  revert failed release 1.0.0
 new 4ecde39  validation/examples: reference released version of 
validation.api
 new 9f4aa15  SLING-6914: Remove commons.json from 
bundles/extensions/validation/examples
 new ccdc6c4  SLING-7167 Adjust READMEs

The 24 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" '].

[sling-org-apache-sling-validation-examples] 08/24: Update to Sling Parent 23

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 3b8a30639e37845bb3190fda1749df35a2adef37
Author: Robert Munteanu 
AuthorDate: Thu Jun 25 13:08:16 2015 +

Update to Sling Parent 23

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d501ab3..186d4c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.sling
 sling
-22
+23
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 05/34: SLING-4777 decouple model provider from the validation service

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit 5f448d9d05413c0e3c57d1933d60431d6898d937
Author: Konrad Windszus 
AuthorDate: Thu Jun 11 09:33:41 2015 +

SLING-4777 decouple model provider from the validation service

This closes #95

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684841 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../validation/testservices/ValidationPostOperation.java  |  6 +++---
 .../validation/testservices/ValidationPostResponse.java   | 15 ---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
index c350cea..2866318 100644
--- 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
+++ 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java
@@ -31,9 +31,9 @@ import org.apache.sling.servlets.post.AbstractPostOperation;
 import org.apache.sling.servlets.post.Modification;
 import org.apache.sling.servlets.post.PostOperation;
 import org.apache.sling.servlets.post.PostResponse;
-import org.apache.sling.validation.api.ValidationModel;
-import org.apache.sling.validation.api.ValidationResult;
-import org.apache.sling.validation.api.ValidationService;
+import org.apache.sling.validation.ValidationResult;
+import org.apache.sling.validation.ValidationService;
+import org.apache.sling.validation.model.ValidationModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
index be9a64d..f535c15 100644
--- 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
+++ 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
@@ -18,19 +18,20 @@
  */
 package org.apache.sling.validation.testservices;
 
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.sling.commons.json.JSONException;
 import org.apache.sling.commons.json.JSONObject;
 import org.apache.sling.servlets.post.AbstractPostResponse;
-import org.apache.sling.validation.api.ValidationResult;
+import org.apache.sling.validation.ValidationResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-import java.util.Map;
-
 public class ValidationPostResponse extends AbstractPostResponse {
 
 private ValidationResult validationResult;

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 28/34: revert failed release 1.0.0

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit d77959afdf214a0489be86da5fbd4e6b48bc1db8
Author: Konrad Windszus 
AuthorDate: Wed Apr 5 13:19:26 2017 +

revert failed release 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1790242 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b1503fa..b2918c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 
 org.apache.sling.validation.test-services
-1.0.1-SNAPSHOT
+1.0.0-SNAPSHOT
 bundle
 
 Apache Sling Validation Framework Testing Services

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-repoinit-parser] 37/46: SLING-6984 - Allow to disable service user

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-parser.git

commit 8853622dbe327153b1b3063ab129d7c7b6bd8fc6
Author: Timothée Maret 
AuthorDate: Fri Aug 18 13:11:46 2017 +

SLING-6984 - Allow to disable service user

* Implement UserVisitor#visitDisableServiceUser
* Add integration test

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805421 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/repoinit/parser/operations/DisableServiceUser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/repoinit/parser/operations/DisableServiceUser.java
 
b/src/main/java/org/apache/sling/repoinit/parser/operations/DisableServiceUser.java
index 221815d..8ff7a21 100644
--- 
a/src/main/java/org/apache/sling/repoinit/parser/operations/DisableServiceUser.java
+++ 
b/src/main/java/org/apache/sling/repoinit/parser/operations/DisableServiceUser.java
@@ -29,7 +29,7 @@ public class DisableServiceUser extends ServiceUserOperation {
 }
 
 @Override
-protected String getParametersDescription() {
+public String getParametersDescription() {
 final StringBuilder sb = new StringBuilder();
 sb.append(super.getParametersDescription());
 if(reason!=null) {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 32/34: revert to newest SNAPSHOT (because the release is not publicly available yet)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit f83efe2bd8be338a9a146fc8556f73df3ae736d2
Author: Konrad Windszus 
AuthorDate: Wed Apr 5 13:52:34 2017 +

revert to newest SNAPSHOT (because the release is not publicly available 
yet)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1790261 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2f40834..24c6100 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
 
 org.apache.sling
 org.apache.sling.validation.api
-1.0.0
+1.0.1-SNAPSHOT
 provided
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-repoinit-parser] 25/46: [maven-release-plugin] prepare release org.apache.sling.repoinit.parser-1.1.0

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-parser.git

commit d43835f39539042c316333a47e4d592655606dbf
Author: Carsten Ziegeler 
AuthorDate: Wed Nov 9 07:27:38 2016 +

[maven-release-plugin] prepare release 
org.apache.sling.repoinit.parser-1.1.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1768848 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9368a39..5654217 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,14 +29,14 @@
 
   org.apache.sling.repoinit.parser
   bundle
-  1.1.1-SNAPSHOT
+  1.1.0
   Apache Sling RepoInit Parser
   Parser for the Repository Initialization language used in 
Sling
 
   
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/parser
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/parser
-
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/parser
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.repoinit.parser-1.1.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.repoinit.parser-1.1.0
+
https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.repoinit.parser-1.1.0
   
   
   

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] branch master created (now 1d690aa)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git.


  at 1d690aa  SLING-7167 Adjust READMEs

This branch includes the following new commits:

 new 3736aed  SLING 4606 move validation from contrib to /
 new 47c4519  use newest parent, get rid of JCR dependency, clean up POMs
 new a7b9915  Set relative path
 new f2cdcb8  Add missing licence headers
 new 5f448d9  SLING-4777 decouple model provider from the validation service
 new 805d186  Update to Sling Parent 23
 new 3a4ce09  Remove superflous sling.java.version=6 as it's the default now
 new 494d109  set parent version to 24 and add empty relativePath where 
missing
 new 09ac45b  SLING-4876 support resource type inheritance for validator 
models
 new 0910bd7  Update the main reactor to parent 25
 new f887234  SLING-5026 - refactor validator interface to allow to set 
multiple failure messages
 new 5b490a0  Switch to parent pom 26
 new f68f704  SLING-4213 leverage sling-i18n for validation failure messages
 new a6c6b73  SLING-5373 allow to set severity per validator in the model
 new b4431c9  use Sling parent 29
 new 64ebfa7  SLING-5590 Move Sling HTTP Servlet Request Adaptor Factory 
out of Validation Core
 new 2b6c2fc  use OSGi R6 annotations and add resource presence (wip)
 new 3d5a8f6  SLING-6578 use dedicated service property "validator.id" for 
referencing the validator from models
 new 8f99dea  use Sling Parent 30
 new c93b6b7  fix scm property
 new a758f3a  clean up pom's for release
 new 6bec3a9  remove resource presence and presenter
 new 428bbda  prevent overwriting of parts of the repository which are not 
affected by test content
 new a415500  fix path parameter directive (fixes IT)
 new e2f2438  SLING-6515 provide a PostProcessor which validates the newly 
generated resouce
 new 0c1e400  SLING-6727 adjust test validation model to new property name
 new 02a8366  [maven-release-plugin] prepare for next development iteration
 new d77959a  revert failed release 1.0.0
 new 10dc401  rely on latest release
 new 79a0294  [maven-release-plugin] prepare release 
org.apache.sling.validation.test-services-1.0.0
 new e47a82e  [maven-release-plugin] prepare for next development iteration
 new f83efe2  revert to newest SNAPSHOT (because the release is not 
publicly available yet)
 new e5d950c  SLING-6913: Remove commons.json from validation/test-services
 new 1d690aa  SLING-7167 Adjust READMEs

The 34 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" '].

[sling-org-apache-sling-validation-examples] 20/24: [maven-release-plugin] prepare for next development iteration

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 4ee6aae23f0a8a85d63fba88de934b55f790501a
Author: Konrad Windszus 
AuthorDate: Wed Apr 5 12:53:17 2017 +

[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1790227 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f52ce72..040a688 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 
 org.apache.sling.validation.examples
-1.0.0-SNAPSHOT
+1.0.1-SNAPSHOT
 bundle
 
 Apache Sling Validation Framework Examples

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 24/34: fix path parameter directive (fixes IT)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit a4155002836cec7ed9f18d40b31bc40d6b57bb91
Author: Konrad Windszus 
AuthorDate: Mon Mar 27 12:12:13 2017 +

fix path parameter directive (fixes IT)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1788918 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9988adf..b2918c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 true
 
 
-
SLING-CONTENT/apps/sling/validation;overwrite:=true;path=/apps/sling/validation
+
SLING-CONTENT/apps/sling/validation;overwrite:=true;path:=/apps/sling/validation
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 02/24: use newest parent, get rid of JCR dependency, clean up POMs

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 89994ce64c797e401d875d1025ca862742dac510
Author: Konrad Windszus 
AuthorDate: Sat Apr 11 17:54:36 2015 +

use newest parent, get rid of JCR dependency, clean up POMs

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1672911 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 27 ---
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae1b515..d501ab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
 
 org.apache.sling
 sling
-15
+22
 
 
-4.0.0
 
 org.apache.sling.validation.examples
 1.0.0-SNAPSHOT
@@ -38,21 +38,18 @@
 
 6
 
+
+
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/examples
+ 
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/examples
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/examples
+
 
 
 
 
 org.apache.felix
 maven-scr-plugin
-1.11.0
-
-
-generate-scr-descriptor
-
-scr
-
-
-
 
 
 org.apache.felix
@@ -96,12 +93,6 @@
 provided
 
 
-javax.jcr
-jcr
-2.0
-provided
-
-
 org.apache.sling
 org.apache.sling.api
 2.4.2
@@ -115,7 +106,6 @@
 
 org.apache.felix
 org.apache.felix.scr.annotations
-1.9.0
 provided
 
 
@@ -137,5 +127,4 @@
 provided
 
 
-
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 11/24: SLING-4876 support resource type inheritance for validator models

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit e2a7fe0c54b2a2acf91f0024c8b7a69e415b0522
Author: Konrad Windszus 
AuthorDate: Wed Jul 29 07:22:46 2015 +

SLING-4876 support resource type inheritance for validator models

This closes #100

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1693191 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/validation/examples/models/UserModel.java | 2 +-
 .../apache/sling/validation/examples/servlets/ModifyUserServlet.java| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/validation/examples/models/UserModel.java 
b/src/main/java/org/apache/sling/validation/examples/models/UserModel.java
index 471bf5d..f07c430 100644
--- a/src/main/java/org/apache/sling/validation/examples/models/UserModel.java
+++ b/src/main/java/org/apache/sling/validation/examples/models/UserModel.java
@@ -80,7 +80,7 @@ public class UserModel {
 
 @PostConstruct
 protected void validate() {
-ValidationModel model = validationService.getValidationModel(resource);
+ValidationModel model = validationService.getValidationModel(resource, 
false);
 if (model != null) {
 ValidationResult result = validationService.validate(resource, 
model);
 if (!result.isValid()) {
diff --git 
a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
 
b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
index 5fb92bc..e7a3944 100644
--- 
a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
+++ 
b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
@@ -58,7 +58,7 @@ public class ModifyUserServlet extends SlingAllMethodsServlet 
{
 }
 if (resourceType != null && !"".equals(resourceType)) {
 String resourcePath = 
request.getRequestPathInfo().getResourcePath();
-ValidationModel vm = 
validationService.getValidationModel(resourceType, resourcePath);
+ValidationModel vm = 
validationService.getValidationModel(resourceType, resourcePath, false);
 if (vm != null) {
 ValidationResult vr = 
validationService.validate(requestParameters, vm);
 if (vr.isValid()) {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 11/34: SLING-5026 - refactor validator interface to allow to set multiple failure messages

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit f8872347c0784c8ea56d7f3537dc81e565773fe4
Author: Konrad Windszus 
AuthorDate: Fri Dec 18 14:50:39 2015 +

SLING-5026 - refactor validator interface to allow to set multiple failure 
messages

This closes #117

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1720802 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/validation/testservices/ValidationPostResponse.java | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
index f535c15..4b71762 100644
--- 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
+++ 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java
@@ -25,9 +25,11 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.sling.commons.json.JSONArray;
 import org.apache.sling.commons.json.JSONException;
 import org.apache.sling.commons.json.JSONObject;
 import org.apache.sling.servlets.post.AbstractPostResponse;
+import org.apache.sling.validation.ValidationFailure;
 import org.apache.sling.validation.ValidationResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,9 +52,14 @@ public class ValidationPostResponse extends 
AbstractPostResponse {
 if (validationResult != null) {
 try {
 jsonResponse.put("valid", validationResult.isValid());
-for (Map.Entry entry : 
validationResult.getFailureMessages().entrySet()) {
-jsonResponse.put(entry.getKey(), entry.getValue());
+JSONArray failures = new JSONArray();
+for (ValidationFailure failure : 
validationResult.getFailures()) {
+JSONObject failureJson = new JSONObject();
+failureJson.put("message", failure.getMessage());
+failureJson.put("location", failure.getLocation());
+failures.put(failureJson);
 }
+jsonResponse.put("failures", failures);
 } catch (JSONException e) {
 LOG.error("JSON error during response send operation.", e);
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 23/24: SLING-6914: Remove commons.json from bundles/extensions/validation/examples

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 9f4aa15a9f24038615c1bb27a4746322e882ee36
Author: Karl Pauls 
AuthorDate: Thu Jun 1 22:02:38 2017 +

SLING-6914: Remove commons.json from bundles/extensions/validation/examples

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1797284 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml|  9 ---
 .../examples/servlets/ModifyUserServlet.java   | 31 +-
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index c1462fc..9ce976a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,9 @@
 
 
org.apache.sling.validation.examples.models
 
SLING-INF;
+
+
org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class
+
 
 
 
@@ -115,9 +118,9 @@
 provided
 
 
-org.apache.sling
-org.apache.sling.commons.json
-2.0.6
+org.apache.felix
+org.apache.felix.utils
+1.9.0
 provided
 
 
diff --git 
a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
 
b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
index b3a832f..71a5806 100644
--- 
a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
+++ 
b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
@@ -27,14 +27,12 @@ import javax.servlet.ServletException;
 
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.sling.SlingServlet;
+import org.apache.felix.utils.json.JSONWriter;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.request.RequestDispatcherOptions;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
-import org.apache.sling.commons.json.JSONArray;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
 import org.apache.sling.validation.ValidationFailure;
 import org.apache.sling.validation.ValidationResult;
 import org.apache.sling.validation.ValidationService;
@@ -69,22 +67,19 @@ public class ModifyUserServlet extends 
SlingAllMethodsServlet {
 request.getRequestDispatcher(request.getResource(), 
options).forward(request, response);
 } else {
 response.setContentType("application/json");
-JSONObject json = new JSONObject();
-try {
-json.put("success", false);
-JSONArray failures = new JSONArray();
-for (ValidationFailure failure : vr.getFailures()) {
-JSONObject failureJson = new JSONObject();
-failureJson.put("message", 
failure.getMessage(request.getResourceBundle(Locale.US)));
-failureJson.put("location", failure.getLocation());
-failures.put(failureJson);
-}
-json.put("failures", failures);
-response.getWriter().print(json.toString());
-response.setStatus(400);
-} catch (JSONException e) {
-throw new IOException(e);
+JSONWriter writer = new JSONWriter(response.getWriter());
+writer.object();
+writer.key("success").value(false);
+writer.key("failures").array();
+for (ValidationFailure failure : vr.getFailures()) {
+writer.object();
+
writer.key("message").value(failure.getMessage(request.getResourceBundle(Locale.US)));
+writer.key("location").value(failure.getLocation());
+writer.endObject();
 }
+writer.endArray();
+writer.endObject();
+response.setStatus(400);
 }
 }
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-test-services] 04/34: Add missing licence headers

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git

commit f2cdcb8a805b14c95068c64ad5da03021075757a
Author: Carsten Ziegeler 
AuthorDate: Mon Apr 27 15:18:24 2015 +

Add missing licence headers

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676297 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../testservices/ValidationPostResponseCreator.java  | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponseCreator.java
 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponseCreator.java
index 27967ae..d96c201 100644
--- 
a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponseCreator.java
+++ 
b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponseCreator.java
@@ -1,4 +1,22 @@
-package org.apache.sling.validation.testservices;
+/*
+ * 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.validation.testservices;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .

[sling-org-apache-sling-validation-examples] 12/24: Update the main reactor to parent 25

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit 91cc4c3d6462415b16e96174010837648a1b12be
Author: Robert Munteanu 
AuthorDate: Mon Oct 5 10:03:45 2015 +

Update the main reactor to parent 25

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5fc10e7..2f5db83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.sling
 sling
-24
+25
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" .