[sling-org-apache-sling-servlets-get] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git The following commit(s) were added to refs/heads/master by this push: new beb19a9 [maven-release-plugin] prepare for next development iteration beb19a9 is described below commit beb19a99b3fd11808f9d0fcac290984244bc5779 Author: Karl Pauls <karlpa...@gmail.com> AuthorDate: Mon Nov 6 14:18:02 2017 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bba5e36..bc8133d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.servlets.get bundle -2.1.30 +2.1.31-SNAPSHOT Apache Sling Default GET Servlets @@ -41,7 +41,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-servlets-get.git - org.apache.sling.servlets.get-2.1.30 + HEAD -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-servlets-get] annotated tag org.apache.sling.servlets.get-2.1.30 created (now 6c83128)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag org.apache.sling.servlets.get-2.1.30 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git. at 6c83128 (tag) tagging d08de9bfcc8967d84cbe40e7d3b17ace8781d927 (commit) replaces org.apache.sling.servlets.get-2.1.28 by Karl Pauls on Mon Nov 6 14:17:56 2017 +0100 - Log - [maven-release-plugin] copy for tag org.apache.sling.servlets.get-2.1.30 --- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-servlets-get] branch master updated: [maven-release-plugin] prepare release org.apache.sling.servlets.get-2.1.30
This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git The following commit(s) were added to refs/heads/master by this push: new d08de9b [maven-release-plugin] prepare release org.apache.sling.servlets.get-2.1.30 d08de9b is described below commit d08de9bfcc8967d84cbe40e7d3b17ace8781d927 Author: Karl Pauls <karlpa...@gmail.com> AuthorDate: Mon Nov 6 14:17:41 2017 +0100 [maven-release-plugin] prepare release org.apache.sling.servlets.get-2.1.30 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5b17526..bba5e36 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.servlets.get bundle -2.1.29-SNAPSHOT +2.1.30 Apache Sling Default GET Servlets @@ -41,7 +41,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-servlets-get.git - HEAD + org.apache.sling.servlets.get-2.1.30 -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-servlets-get] branch master updated: SLING-7228: Don't close response writer when sending json responses.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git
The following commit(s) were added to refs/heads/master by this push:
new 3fbf470 SLING-7228: Don't close response writer when sending json
responses.
3fbf470 is described below
commit 3fbf470683a9a53f2151e94f86e5ca4121b43bea
Author: Karl Pauls <karlpa...@gmail.com>
AuthorDate: Fri Nov 3 00:05:53 2017 +0100
SLING-7228: Don't close response writer when sending json responses.
---
.../get/impl/helpers/JsonRendererServlet.java | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java
b/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java
index c2bfb37..253df1e 100644
---
a/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java
+++
b/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java
@@ -17,6 +17,7 @@
package org.apache.sling.servlets.get.impl.helpers;
import java.io.IOException;
+import java.io.StringWriter;
import javax.json.Json;
import javax.json.stream.JsonGenerator;
@@ -116,22 +117,26 @@ public class JsonRendererServlet extends
SlingSafeMethodsServlet {
// If no rendering options, use the plain toString()
method, for
// backwards compatibility. Output might be slightly
different
// with prettyPrint and no options
-
Json.createGenerator(resp.getWriter()).write(traversor.getJSONObject()).close();
+StringWriter writer = new StringWriter();
+
Json.createGenerator(writer).write(traversor.getJSONObject()).close();
+resp.getWriter().write(writer.toString());
}
} else {
// We are not allowed to do the dump.
-// Send a 300
+// Send a 300
String tidyUrl = (tidy) ? "tidy." : "";
resp.setStatus(HttpServletResponse.SC_MULTIPLE_CHOICES);
-JsonGenerator writer = Json.createGenerator(resp.getWriter());
-writer.writeStartArray();
+StringWriter writer = new StringWriter();
+JsonGenerator json = Json.createGenerator(writer);
+json.writeStartArray();
while (allowedLevel >= 0) {
-writer.write(r.getResourceMetadata().getResolutionPath() +
"." + tidyUrl + allowedLevel + ".json");
+json.write(r.getResourceMetadata().getResolutionPath() +
"." + tidyUrl + allowedLevel + ".json");
allowedLevel--;
}
-writer.writeEnd();
-writer.close();
+json.writeEnd();
+json.close();
+resp.getWriter().write(writer.toString());
}
} catch (Exception je) {
reportException(je);
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-serviceusermapper] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git The following commit(s) were added to refs/heads/master by this push: new 7651a36 [maven-release-plugin] prepare for next development iteration 7651a36 is described below commit 7651a36fba94e15c53f09b0a3a7dbda8532326a3 Author: Karl Pauls <karlpa...@gmail.com> AuthorDate: Thu Nov 2 17:06:33 2017 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 360e739..a2cece3 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.serviceusermapper bundle -1.3.6 +1.3.7-SNAPSHOT Apache Sling Service User Mapper @@ -43,7 +43,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-serviceusermapper.git - org.apache.sling.serviceusermapper-1.3.6 + HEAD -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-serviceusermapper] annotated tag org.apache.sling.serviceusermapper-1.3.6 created (now 8fcadcb)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag org.apache.sling.serviceusermapper-1.3.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git. at 8fcadcb (tag) tagging 9e49946eb2919b5f02e6300dad304394434c1ba0 (commit) by Karl Pauls on Thu Nov 2 17:06:29 2017 +0100 - Log - [maven-release-plugin] copy for tag org.apache.sling.serviceusermapper-1.3.6 --- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-serviceusermapper] branch master updated: [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.3.6
This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git The following commit(s) were added to refs/heads/master by this push: new 9e49946 [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.3.6 9e49946 is described below commit 9e49946eb2919b5f02e6300dad304394434c1ba0 Author: Karl Pauls <karlpa...@gmail.com> AuthorDate: Thu Nov 2 17:05:36 2017 +0100 [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.3.6 --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8b794f4..360e739 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.serviceusermapper bundle -1.3.5-SNAPSHOT +1.3.6 Apache Sling Service User Mapper @@ -43,7 +43,8 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-serviceusermapper.git - + org.apache.sling.serviceusermapper-1.3.6 + -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-serviceusermapper] branch master updated: Update javadoc
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
The following commit(s) were added to refs/heads/master by this push:
new ead282d Update javadoc
ead282d is described below
commit ead282d9a5672c537bfd93aa9a6d1d34dc94c54d
Author: Karl Pauls <karlpa...@gmail.com>
AuthorDate: Thu Nov 2 17:04:57 2017 +0100
Update javadoc
---
.../apache/sling/serviceusermapping/ServicePrincipalsValidator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java
b/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java
index 4fa384b..9d87cf0 100644
---
a/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java
+++
b/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java
@@ -28,10 +28,10 @@ public interface ServicePrincipalsValidator {
/**
* Validates the configured service principal names.
*
- * @param serviceUserId The principal names associated with the service.
+ * @param servicePrincipalNames The principal names associated with the
service.
* @param serviceName The name of the service
* @param subServiceName The optional sub service name.
* @return {@code true} if all configured service principal names are
valid; {@code false} otherwise.
*/
boolean isValid(Iterable servicePrincipalNames, String
serviceName, String subServiceName);
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-serviceusermapper] branch master updated: SLING-7225: preserve order of principal names in mapping. Patch provided by Angela Schreiber. Thanks.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
The following commit(s) were added to refs/heads/master by this push:
new aa2ec80 SLING-7225: preserve order of principal names in mapping.
Patch provided by Angela Schreiber. Thanks.
aa2ec80 is described below
commit aa2ec80df3812954cc939f512c00c7a990deba29
Author: Karl Pauls <karlpa...@gmail.com>
AuthorDate: Thu Nov 2 17:00:19 2017 +0100
SLING-7225: preserve order of principal names in mapping. Patch provided by
Angela Schreiber. Thanks.
---
src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java
b/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java
index 503a985..9dfc7c3 100644
--- a/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java
+++ b/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.serviceusermapping.impl;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Set;
/**
@@ -87,7 +87,7 @@ class Mapping implements Comparable {
static Set extractPrincipalNames(String s) {
String[] sArr = s.substring(1, s.length() - 1).split(",");
-Set set = new HashSet<>();
+Set set = new LinkedHashSet<>();
for (String name : sArr) {
String n = name.trim();
if (!n.isEmpty()) {
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-serviceusermapper] branch test deleted (was 39f75f8)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git. was 39f75f8 SLING-7213 - Add a default .gitignore file to every module The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-serviceusermapper] branch test created (now 39f75f8)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git. at 39f75f8 SLING-7213 - Add a default .gitignore file to every module No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
svn commit: r1812124 - /sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
Author: pauls
Date: Fri Oct 13 12:27:01 2017
New Revision: 1812124
URL: http://svn.apache.org/viewvc?rev=1812124=rev
Log:
SLING-7198: Remove duplicated lookup for mapping without subserviceName.
Modified:
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
Modified:
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java?rev=1812124=1812123=1812124=diff
==
---
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
(original)
+++
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
Fri Oct 13 12:27:01 2017
@@ -479,14 +479,6 @@ public class ServiceUserMapperImpl imple
}
}
-for (Mapping mapping : this.activeMappings) {
-final Iterable principalNames =
mapping.mapPrincipals(serviceName, null);
-if (principalNames != null) {
-log.debug("Got principalNames [{}] from {}/{}", new Object[]
{principalNames, serviceName });
-return principalNames;
-}
-}
-
// second round without serviceInfo
log.debug(
"internalGetPrincipalNames: {} active mappings, looking for
mapping for {}/",
svn commit: r1812116 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java
Author: pauls
Date: Fri Oct 13 11:49:22 2017
New Revision: 1812116
URL: http://svn.apache.org/viewvc?rev=1812116=rev
Log:
SLING-7144: Make the JcrSystemUserValidator identifiy disabled system users as
invalid. Patch provided by Angela Schreiber - Thanks.
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java?rev=1812116=1812115=1812116=diff
==
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java
Fri Oct 13 11:49:22 2017
@@ -128,7 +128,7 @@ public class JcrSystemUserValidator impl
if (administrativeSession instanceof JackrabbitSession) {
final UserManager userManager = ((JackrabbitSession)
administrativeSession).getUserManager();
final Authorizable authorizable =
userManager.getAuthorizable(serviceUserId);
-if (authorizable != null && !authorizable.isGroup() &&
(isSystemUser((User)authorizable))) {
+if (isValidSystemUser(authorizable)) {
validIds.add(serviceUserId);
log.debug("The provided service user id {} is a
known JCR system user id", serviceUserId);
return true;
@@ -191,7 +191,7 @@ public class JcrSystemUserValidator impl
return pName;
}
});
-if (authorizable != null && !authorizable.isGroup() &&
(isSystemUser((User) authorizable))) {
+if (isValidSystemUser(authorizable)) {
validPrincipalNames.add(pName);
log.debug("The provided service principal name {} is a
known JCR system user", pName);
} else {
@@ -210,16 +210,28 @@ public class JcrSystemUserValidator impl
return invalid.isEmpty();
}
-private boolean isSystemUser(final User user){
-if (isSystemUserMethod != null) {
-try {
-return (Boolean) isSystemUserMethod.invoke(user);
-} catch (Exception e) {
-log.debug("Exception while invoking isSystemUser method", e);
-return true;
+private boolean isValidSystemUser(final Authorizable authorizable){
+if (authorizable == null || authorizable.isGroup()) {
+return false;
+}
+
+User user = (User) authorizable;
+try {
+if (!user.isDisabled()) {
+if (isSystemUserMethod != null) {
+try {
+return (Boolean) isSystemUserMethod.invoke(user);
+} catch (Exception e) {
+log.debug("Exception while invoking isSystemUser
method", e);
+return true;
+}
+} else {
+return true;
+}
}
- } else {
- return true;
- }
+} catch (RepositoryException e) {
+log.debug("Exception while invoking isDisabled method", e);
+}
+return false;
}
}
\ No newline at end of file
svn commit: r22213 - /release/sling/
Author: pauls Date: Tue Oct 10 21:05:47 2017 New Revision: 22213 Log: Add the Apache Sling Bundle Resource 2.3.0 and the Apache Sling Starter Startup 1.0.2 releases. Added: release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip (with props) release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.md5 release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.sha1 release/sling/org.apache.sling.bundleresource.impl-2.3.0-sources.jar (with props) release/sling/org.apache.sling.bundleresource.impl-2.3.0-sources.jar.asc release/sling/org.apache.sling.bundleresource.impl-2.3.0-sources.jar.md5 release/sling/org.apache.sling.bundleresource.impl-2.3.0-sources.jar.sha1 release/sling/org.apache.sling.bundleresource.impl-2.3.0.jar (with props) release/sling/org.apache.sling.bundleresource.impl-2.3.0.jar.asc release/sling/org.apache.sling.bundleresource.impl-2.3.0.jar.md5 release/sling/org.apache.sling.bundleresource.impl-2.3.0.jar.sha1 release/sling/org.apache.sling.bundleresource.impl-2.3.0.pom release/sling/org.apache.sling.bundleresource.impl-2.3.0.pom.asc release/sling/org.apache.sling.bundleresource.impl-2.3.0.pom.md5 release/sling/org.apache.sling.bundleresource.impl-2.3.0.pom.sha1 release/sling/org.apache.sling.starter.startup-1.0.2-source-release.zip (with props) release/sling/org.apache.sling.starter.startup-1.0.2-source-release.zip.asc release/sling/org.apache.sling.starter.startup-1.0.2-source-release.zip.md5 release/sling/org.apache.sling.starter.startup-1.0.2-source-release.zip.sha1 release/sling/org.apache.sling.starter.startup-1.0.2-sources.jar (with props) release/sling/org.apache.sling.starter.startup-1.0.2-sources.jar.asc release/sling/org.apache.sling.starter.startup-1.0.2-sources.jar.md5 release/sling/org.apache.sling.starter.startup-1.0.2-sources.jar.sha1 release/sling/org.apache.sling.starter.startup-1.0.2.jar (with props) release/sling/org.apache.sling.starter.startup-1.0.2.jar.asc release/sling/org.apache.sling.starter.startup-1.0.2.jar.md5 release/sling/org.apache.sling.starter.startup-1.0.2.jar.sha1 release/sling/org.apache.sling.starter.startup-1.0.2.pom release/sling/org.apache.sling.starter.startup-1.0.2.pom.asc release/sling/org.apache.sling.starter.startup-1.0.2.pom.md5 release/sling/org.apache.sling.starter.startup-1.0.2.pom.sha1 Removed: release/sling/org.apache.sling.bundleresource.impl-2.2.0-javadoc.jar release/sling/org.apache.sling.bundleresource.impl-2.2.0-javadoc.jar.asc release/sling/org.apache.sling.bundleresource.impl-2.2.0-javadoc.jar.md5 release/sling/org.apache.sling.bundleresource.impl-2.2.0-javadoc.jar.sha1 release/sling/org.apache.sling.bundleresource.impl-2.2.0-source-release.zip release/sling/org.apache.sling.bundleresource.impl-2.2.0-source-release.zip.asc release/sling/org.apache.sling.bundleresource.impl-2.2.0-source-release.zip.md5 release/sling/org.apache.sling.bundleresource.impl-2.2.0-source-release.zip.sha1 release/sling/org.apache.sling.bundleresource.impl-2.2.0-sources.jar release/sling/org.apache.sling.bundleresource.impl-2.2.0-sources.jar.asc release/sling/org.apache.sling.bundleresource.impl-2.2.0-sources.jar.md5 release/sling/org.apache.sling.bundleresource.impl-2.2.0-sources.jar.sha1 release/sling/org.apache.sling.bundleresource.impl-2.2.0.jar release/sling/org.apache.sling.bundleresource.impl-2.2.0.jar.asc release/sling/org.apache.sling.bundleresource.impl-2.2.0.jar.md5 release/sling/org.apache.sling.bundleresource.impl-2.2.0.jar.sha1 release/sling/org.apache.sling.bundleresource.impl-2.2.0.pom release/sling/org.apache.sling.bundleresource.impl-2.2.0.pom.asc release/sling/org.apache.sling.bundleresource.impl-2.2.0.pom.md5 release/sling/org.apache.sling.bundleresource.impl-2.2.0.pom.sha1 Added: release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc == --- release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc (added) +++ release/sling/org.apache.sling.bundleresource.impl-2.3.0-source-release.zip.asc Tue Oct 10 21:05:47 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn
svn commit: r1811166 - /sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSDynamicClassLoader.java
Author: pauls
Date: Thu Oct 5 07:54:30 2017
New Revision: 1811166
URL: http://svn.apache.org/viewvc?rev=1811166=rev
Log:
SLING-7175: Improve concurrency in FSDynamicClassLoader.
Modified:
sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSDynamicClassLoader.java
Modified:
sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSDynamicClassLoader.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSDynamicClassLoader.java?rev=1811166=1811165=1811166=diff
==
---
sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSDynamicClassLoader.java
(original)
+++
sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSDynamicClassLoader.java
Thu Oct 5 07:54:30 2017
@@ -23,6 +23,7 @@ import java.net.URLClassLoader;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.sling.commons.classloader.DynamicClassLoader;
@@ -30,10 +31,9 @@ public class FSDynamicClassLoader
extends URLClassLoader
implements DynamicClassLoader {
-private boolean isDirty = false;
+private volatile boolean isDirty = false;
-private final Set hit = Collections.synchronizedSet(new
HashSet());
-private final Set miss = Collections.synchronizedSet(new
HashSet());
+private final Set loads = Collections.newSetFromMap(new
ConcurrentHashMap<String, Boolean>());
private final DynamicClassLoader parentLoader;
@@ -55,18 +55,15 @@ public class FSDynamicClassLoader
@Override
public Class loadClass(final String name) throws ClassNotFoundException
{
try {
-final Class c = super.loadClass(name);
-this.hit.add(name);
-return c;
-} catch (final ClassNotFoundException cnfe) {
-this.miss.add(name);
-throw cnfe;
+return super.loadClass(name);
+} finally {
+this.loads.add(name);
}
}
public void check(final String className) {
if ( !this.isDirty ) {
-this.isDirty = hit.contains(className) || miss.contains(className);
+this.isDirty = loads.contains(className);
}
}
}
svn commit: r1809819 - /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
Author: pauls
Date: Wed Sep 27 09:22:12 2017
New Revision: 1809819
URL: http://svn.apache.org/viewvc?rev=1809819=rev
Log:
SLING-7156: don't make assumptions about the path of URLs returned from
bundle.findEntries()
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java?rev=1809819=1809818=1809819=diff
==
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
Wed Sep 27 09:22:12 2017
@@ -133,8 +133,7 @@ public class SlingTldLocationsCache
synchronized (tldLocations) {
if (uri != null && !tldLocations.containsKey(uri)) {
-tldLocations.put(uri, new TldLocationEntry(bundle,
-taglib.getPath()));
+tldLocations.put(uri, new TldLocationEntry(bundle,
taglib));
}
}
}
@@ -213,9 +212,9 @@ public class SlingTldLocationsCache
private final URL tldURL;
-private TldLocationEntry(final Bundle bundle, final String tldPath) {
+private TldLocationEntry(final Bundle bundle, final URL tldURL) {
this.bundleId = bundle.getBundleId();
-this.tldURL = bundle.getEntry(tldPath);
+this.tldURL = tldURL;
}
long getBundleId() {
svn commit: r1809731 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
Author: pauls
Date: Tue Sep 26 11:03:13 2017
New Revision: 1809731
URL: http://svn.apache.org/viewvc?rev=1809731=rev
Log:
Remove a system.out.println
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java?rev=1809731=1809730=1809731=diff
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java
Tue Sep 26 11:03:13 2017
@@ -352,7 +352,7 @@ public class ArtifactManager {
}
return cacheFile;
} catch ( final Exception e) {
-e.printStackTrace();
+logger.info("Artifact not found in one repository", e);
// ignore for now
return null;
}
svn commit: r1809730 - /sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
Author: pauls
Date: Tue Sep 26 10:46:13 2017
New Revision: 1809730
URL: http://svn.apache.org/viewvc?rev=1809730=rev
Log:
Make m2 repos optional
Modified:
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
Modified:
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java?rev=1809730=1809729=1809730=diff
==
---
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
Tue Sep 26 10:46:13 2017
@@ -75,7 +75,7 @@ public class Main {
*/
private static void parseArgs(final String[] args) {
final Option repoOption = Option.builder("u").hasArg().argName("Set
repository url")
-.desc("repository url").required().build();
+.desc("repository url").build();
final Option filesOption = new Option("f", true, "Set feature files
(comma separated)");
final Option dirsOption = new Option("d", true, "Set feature file dirs
(comma separated)");
svn commit: r1809729 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
Author: pauls
Date: Tue Sep 26 10:44:34 2017
New Revision: 1809729
URL: http://svn.apache.org/viewvc?rev=1809729=rev
Log:
Add apache snapshot repo
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java?rev=1809729=1809728=1809729=diff
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
Tue Sep 26 10:44:34 2017
@@ -47,7 +47,8 @@ public class ArtifactManagerConfig imple
// set defaults
this.repositoryUrls = new String[] {
"file://" + System.getProperty("user.home") +
"/.m2/repository",
-"https://repo.maven.apache.org/maven2;
+"https://repo.maven.apache.org/maven2;,
+"https://repository.apache.org/content/groups/snapshots;
};
try {
this.cacheDirectory =
Files.createTempDirectory("slingfeature").toFile();
svn commit: r1809710 - /sling/whiteboard/cziegeler/feature-analyser/pom.xml
Author: pauls Date: Tue Sep 26 07:56:14 2017 New Revision: 1809710 URL: http://svn.apache.org/viewvc?rev=1809710=rev Log: Fix converter version Modified: sling/whiteboard/cziegeler/feature-analyser/pom.xml Modified: sling/whiteboard/cziegeler/feature-analyser/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/pom.xml?rev=1809710=1809709=1809710=diff == --- sling/whiteboard/cziegeler/feature-analyser/pom.xml (original) +++ sling/whiteboard/cziegeler/feature-analyser/pom.xml Tue Sep 26 07:56:14 2017 @@ -126,7 +126,7 @@ org.apache.felix org.apache.felix.converter - 0.1-SNAPSHOT + 0.1.0-SNAPSHOT provided
svn commit: r1809227 - /sling/whiteboard/cziegeler/example/sling/sling.json
Author: pauls
Date: Thu Sep 21 20:56:48 2017
New Revision: 1809227
URL: http://svn.apache.org/viewvc?rev=1809227=rev
Log:
Add the installer.package support
Modified:
sling/whiteboard/cziegeler/example/sling/sling.json
Modified: sling/whiteboard/cziegeler/example/sling/sling.json
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/example/sling/sling.json?rev=1809227=1809226=1809227=diff
==
--- sling/whiteboard/cziegeler/example/sling/sling.json (original)
+++ sling/whiteboard/cziegeler/example/sling/sling.json Thu Sep 21 20:56:48 2017
@@ -1 +1 @@
-{"id":"generated/sling/1.0.0","bundles":{"5":["commons-fileupload/commons-fileupload/1.3.2","commons-io/commons-io/2.5","org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.5","org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.7","org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.1.5","org.apache.felix/org.apache.felix.bundlerepository/1.6.4","org.apache.felix/org.apache.felix.inventory/1.0.4","org.apache.felix/org.apache.felix.prefs/1.1.0","org.apache.felix/org.apache.felix.webconsole.plugins.ds/2.0.6","org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.6","org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.6","org.apache.felix/org.apache.felix.webconsole.plugins.obr/1.0.4","org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4","org.apache.felix/org.apache.felix.webconsole/4.3.4","org.apache.sling/org.apache.sling.commons.johnzon/1.1.0","org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0","org.apache.sling/org.apache.
sling.extensions.threaddump/0.2.2","org.apache.sling/org.apache.sling.extensions.webconsolebranding/1.0.2","org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.0.0"],"10":["org.apache.felix/org.apache.felix.http.sslfilter/1.2.2","org.apache.felix/org.apache.felix.metatype/1.1.4","org.apache.felix/org.apache.felix.scr/2.0.12","org.apache.pdfbox/fontbox/2.0.7","org.apache.pdfbox/jempbox/1.8.13","org.apache.pdfbox/pdfbox/2.0.7","org.apache.tika/tika-core/1.14","org.apache.tika/tika-parsers/1.14"],"15":["com.google.guava/guava/15.0","io.dropwizard.metrics/metrics-core/3.2.3","org.apache.jackrabbit/jackrabbit-api/2.14.3","org.apache.jackrabbit/jackrabbit-data/2.14.3","org.apache.jackrabbit/jackrabbit-jcr-commons/2.14.3","org.apache.jackrabbit/jackrabbit-jcr-rmi/2.14.3","org.apache.jackrabbit/jackrabbit-spi-commons/2.14.3","org.apache.jackrabbit/jackrabbit-spi/2.14.3","org.apache.jackrabbit/jackrabbit-webdav/2.14.3","org.apache.sling/org.apache.sling.commons.metrics/
1.2.0","org.apache.sling/org.apache.sling.jcr.api/2.4.0","org.apache.sling/org.apache.sling.jcr.base/3.0.4","org.apache.sling/org.apache.sling.jcr.davex/1.3.8","org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/3.0.0","org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.6","org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0","org.apache.sling/org.apache.sling.jcr.registration/1.0.2","org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2","org.apache.sling/org.apache.sling.jcr.webdav/2.3.8"],"20":["commons-codec/commons-codec/1.9","commons-collections/commons-collections/3.2.2","commons-lang/commons-lang/2.6","javax.mail/mail/1.4.7","org.apache.commons/commons-collections4/4.1","org.apache.commons/commons-lang3/3.5","org.apache.commons/commons-math/2.2","org.apache.felix/org.apache.felix.http.whiteboard/3.0.0","org.apache.geronimo.bundles/commons-httpclient/3.1_1","org.apache.geronimo.bundles/jstl/1.2_1","org.apache.httpcomponents/httpclient-osgi/4.4.1
","org.apache.httpcomponents/httpcore-osgi/4.4.1","org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.7.1_1","org.apache.sling/org.apache.sling.adapter/2.1.10","org.apache.sling/org.apache.sling.api/2.16.2","org.apache.sling/org.apache.sling.auth.core/1.4.0","org.apache.sling/org.apache.sling.auth.form/1.0.8","org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0","org.apache.sling/org.apache.sling.commons.classloader/1.4.0","org.apache.sling/org.apache.sling.commons.compiler/2.3.0","org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.6","org.apache.sling/org.ap
svn commit: r1809082 - in /sling/whiteboard/pauls/engine/src: main/java/org/apache/sling/engine/impl/ main/java/org/apache/sling/engine/impl/parameters/ main/java/org/apache/sling/engine/impl/request/
Author: pauls
Date: Wed Sep 20 21:05:14 2017
New Revision: 1809082
URL: http://svn.apache.org/viewvc?rev=1809082=rev
Log:
Support streaming of request body.
Removed:
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportConfigurer.java
Modified:
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplBase.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportFilter.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
sling/whiteboard/pauls/engine/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java
sling/whiteboard/pauls/engine/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java
sling/whiteboard/pauls/engine/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java
sling/whiteboard/pauls/engine/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
Modified:
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java?rev=1809082=1809081=1809082=diff
==
---
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
(original)
+++
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
Wed Sep 20 21:05:14 2017
@@ -18,23 +18,19 @@
*/
package org.apache.sling.engine.impl;
-import java.io.IOException;
-import java.net.URL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.auth.core.AuthenticationSupport;
import org.apache.sling.commons.mime.MimeTypeService;
-import org.apache.sling.engine.impl.parameters.ParameterSupport;
-import org.apache.sling.engine.impl.request.RequestData;
import org.apache.sling.engine.impl.request.SlingRequestProgressTracker;
import org.osgi.service.http.context.ServletContextHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URL;
+
/**
* The SlingHttpContext implements the OSGi HttpContext used to
* register the {@link SlingMainServlet} with the OSGi HttpService.
@@ -126,14 +122,8 @@ class SlingHttpContext extends ServletCo
final AuthenticationSupport authenticator = this.authenticationSupport;
if (authenticator != null) {
-// SLING-559: ensure correct parameter handling according to
-// ParameterSupport if path is configured to match
-if (ParameterSupport.matches(request.getRequestURI())) {
-request =
ParameterSupport.getParameterSupportRequestWrapper(request);
-}
-else {
-request = new SlingHttpServletRequestImplBase(request);
-}
+// ensure correct parameter handling
+ request = SlingHttpServletRequestImplBase.wrap(request);
final boolean result = authenticator.handleSecurity(request,
response);
t.logTimer(timerName, "authenticator {0} returns {1}",
authenticator, result);
Modified:
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java?rev=1809082=1809081=1809082=diff
==
---
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
(original)
+++
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
Wed Sep 20 21:05:14 2017
@@ -20,51 +20,32 @@ package org.apache.sling.engine.impl;
svn commit: r1808954 - in /sling/whiteboard/pauls/engine: ./ src/main/java/org/apache/sling/engine/impl/ src/main/java/org/apache/sling/engine/impl/parameters/ src/main/java/org/apache/sling/engine/im
Author: pauls
Date: Tue Sep 19 22:09:13 2017
New Revision: 1808954
URL: http://svn.apache.org/viewvc?rev=1808954=rev
Log:
Add a fork of the engine to prototype using the default servlet 3.1 support for
multipart requests
Added:
sling/whiteboard/pauls/engine/
- copied from r1808953, sling/trunk/bundles/engine/
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplBase.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportFilter.java
Modified:
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/MultipartRequestParameter.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupportHttpServletRequestWrapper.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportConfigurer.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingUnsupportedEncodingException.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
Modified:
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java?rev=1808954=1808953=1808954=diff
==
---
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
(original)
+++
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
Tue Sep 19 22:09:13 2017
@@ -24,10 +24,12 @@ import java.net.URL;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.auth.core.AuthenticationSupport;
import org.apache.sling.commons.mime.MimeTypeService;
import org.apache.sling.engine.impl.parameters.ParameterSupport;
+import org.apache.sling.engine.impl.request.RequestData;
import org.apache.sling.engine.impl.request.SlingRequestProgressTracker;
import org.osgi.service.http.context.ServletContextHelper;
import org.slf4j.Logger;
@@ -125,8 +127,13 @@ class SlingHttpContext extends ServletCo
if (authenticator != null) {
// SLING-559: ensure correct parameter handling according to
-// ParameterSupport
-request =
ParameterSupport.getParameterSupportRequestWrapper(request);
+// ParameterSupport if path is configured to match
+if (ParameterSupport.matches(request.getRequestURI())) {
+request =
ParameterSupport.getParameterSupportRequestWrapper(request);
+}
+else {
+request = new SlingHttpServletRequestImplBase(request);
+}
final boolean result = authenticator.handleSecurity(request,
response);
t.logTimer(timerName, "authenticator {0} returns {1}",
authenticator, result);
Modified:
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java?rev=1808954=1808953=1808954=diff
==
---
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
(original)
+++
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
Tue Sep 19 22:09:13 2017
@@ -18,27 +18,6 @@
*/
package org.apache.sling.engine.impl;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Se
svn commit: r1808953 - /sling/whiteboard/pauls/engine/
Author: pauls Date: Tue Sep 19 22:06:26 2017 New Revision: 1808953 URL: http://svn.apache.org/viewvc?rev=1808953=rev Log: Remove poc Removed: sling/whiteboard/pauls/engine/
svn commit: r1808882 - in /sling/whiteboard/pauls: api/ api/src/main/java/org/apache/sling/api/ api/src/main/java/org/apache/sling/api/request/ engine/ engine/src/main/java/org/apache/sling/engine/imp
Author: pauls
Date: Tue Sep 19 14:15:50 2017
New Revision: 1808882
URL: http://svn.apache.org/viewvc?rev=1808882=rev
Log:
Add a fork of the api and the engine to prototype using the default servlet 3.1
support for multipart requests
Added:
sling/whiteboard/pauls/api/
- copied from r1808880, sling/trunk/bundles/api/
sling/whiteboard/pauls/engine/
- copied from r1808880, sling/trunk/bundles/engine/
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportFilter.java
Removed:
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportConfigurer.java
Modified:
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/request/RequestParameterMap.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/MultipartRequestParameter.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupportHttpServletRequestWrapper.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingUnsupportedEncodingException.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
sling/whiteboard/pauls/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
Modified:
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java?rev=1808882=1808880=1808882=diff
==
---
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
(original)
+++
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
Tue Sep 19 14:15:50 2017
@@ -109,6 +109,7 @@ public interface SlingHttpServletRequest
* @see RequestParameterMap#getValue(String)
* @throws IllegalArgumentException if name is null.
*/
+@Deprecated
@CheckForNull RequestParameter getRequestParameter(@Nonnull String name);
/**
@@ -129,6 +130,7 @@ public interface SlingHttpServletRequest
* @see RequestParameterMap#getValues(String)
* @throws IllegalArgumentException if name is null.
*/
+@Deprecated
@CheckForNull RequestParameter[] getRequestParameters(@Nonnull String
name);
/**
@@ -145,6 +147,7 @@ public interface SlingHttpServletRequest
* parameter map are of type String. The values in the parameter
map
* are of type {@link RequestParameter} array
(RequestParameter[]).
*/
+@Deprecated
@Nonnull RequestParameterMap getRequestParameterMap();
/**
@@ -157,6 +160,7 @@ public interface SlingHttpServletRequest
* order.
* @since 2.3 (Sling API Bundle 2.6.0)
*/
+@Deprecated
@Nonnull List getRequestParameterList();
/**
Modified:
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/request/RequestParameter.java?rev=1808882=1808880=1808882=diff
==
---
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
(original)
+++
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
Tue Sep 19 14:15:50 2017
@@ -39,6 +39,7 @@ import org.osgi.annotation.versioning.Pr
* @see org.apache.sling.api.SlingHttpServletRequest#getRequestParameterMap()
*/
@ProviderType
+@Deprecated
public interface RequestParameter {
/**
Modified:
sling/whiteboard/pauls/api/src/main/java/org/apache/sling/api/request
svn commit: r1808734 - in /sling/whiteboard/cziegeler/example: ./ sling/
Author: pauls
Date: Mon Sep 18 15:15:55 2017
New Revision: 1808734
URL: http://svn.apache.org/viewvc?rev=1808734=rev
Log:
Add a simple conversion of sling provisioning files to features as an example.
Added:
sling/whiteboard/cziegeler/example/
sling/whiteboard/cziegeler/example/sling/
sling/whiteboard/cziegeler/example/sling/boot.json
sling/whiteboard/cziegeler/example/sling/composum-console.json
sling/whiteboard/cziegeler/example/sling/launchpad.json
sling/whiteboard/cziegeler/example/sling/models-jacksonexporter.json
sling/whiteboard/cziegeler/example/sling/oak.json
sling/whiteboard/cziegeler/example/sling/repoinit.json
sling/whiteboard/cziegeler/example/sling/sling-event.json
sling/whiteboard/cziegeler/example/sling/sling-validation.json
sling/whiteboard/cziegeler/example/sling/sling.json
sling/whiteboard/cziegeler/example/sling/slingshot.json
sling/whiteboard/cziegeler/example/sling/standalone.json
Added: sling/whiteboard/cziegeler/example/sling/boot.json
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/example/sling/boot.json?rev=1808734=auto
==
--- sling/whiteboard/cziegeler/example/sling/boot.json (added)
+++ sling/whiteboard/cziegeler/example/sling/boot.json Mon Sep 18 15:15:55 2017
@@ -0,0 +1 @@
+{"id":"generated/:boot/1.0.0","bundles":{"1":["org.apache.aries/org.apache.aries.util/1.1.3","org.apache.felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT","org.apache.felix/org.apache.felix.eventadmin/1.4.10","org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0","org.apache.sling/org.apache.sling.commons.log/5.0.2","org.apache.sling/org.apache.sling.commons.logservice/1.0.6","org.apache.sling/org.apache.sling.fragment.transaction/1.0.0","org.apache.sling/org.apache.sling.fragment.ws/1.0.2","org.apache.sling/org.apache.sling.fragment.xml/1.0.2","org.apache.sling/org.apache.sling.installer.core/3.8.10","org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2","org.apache.sling/org.apache.sling.installer.provider.file/1.1.0","org.apache.sling/org.apache.sling.javax.activation/0.1.0","org.apache.sling/org.apache.sling.launchpad.installer/1.2.2","org.apache.sling/org.apache.sling.settings/1.3.8","org.slf4j/jcl-over-slf4j/1.7.25","org.slf4j/log4j-over-slf4j/1.7.25","
org.slf4j/slf4j-api/1.7.25"]}}
Added: sling/whiteboard/cziegeler/example/sling/composum-console.json
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/example/sling/composum-console.json?rev=1808734=auto
==
--- sling/whiteboard/cziegeler/example/sling/composum-console.json (added)
+++ sling/whiteboard/cziegeler/example/sling/composum-console.json Mon Sep 18
15:15:55 2017
@@ -0,0 +1 @@
+{"id":"generated/composum-console/1.0.0","bundles":{"20":["com.composum.sling.core/composum-sling-core-commons/1.8.2","com.composum.sling.core/composum-sling-core-config/1.8.2","com.composum.sling.core/composum-sling-core-console/1.8.2","com.composum.sling.core/composum-sling-core-jslibs/1.8.2","com.composum.sling.core/composum-sling-package-manager/1.8.2","com.composum.sling.core/composum-sling-user-management/1.8.2","org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.30"]}}
\ No newline at end of file
Added: sling/whiteboard/cziegeler/example/sling/launchpad.json
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/example/sling/launchpad.json?rev=1808734=auto
==
--- sling/whiteboard/cziegeler/example/sling/launchpad.json (added)
+++ sling/whiteboard/cziegeler/example/sling/launchpad.json Mon Sep 18 15:15:55
2017
@@ -0,0 +1 @@
+{"id":"generated/:launchpad/1.0.0","framework-properties":{"localIndexDir":"${sling.home}/repository/index","repository.home":"${sling.home}/repository","sling.run.mode.install.options":"oak_tar,oak_mongo"}}
\ No newline at end of file
Added: sling/whiteboard/cziegeler/example/sling/models-jacksonexporter.json
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/example/sling/models-jacksonexporter.json?rev=1808734=auto
==
--- sling/whiteboard/cziegeler/example/sling/models-jacksonexporter.json (added)
+++ sling/whiteboard/cziegeler/example/sling/models-jacksonexporter.json Mon
Sep 18 15:15:55 2017
@@ -0,0 +1 @@
+{"id":"generated/models-jacksonexporter
svn commit: r1808733 - /sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
Author: pauls
Date: Mon Sep 18 15:14:42 2017
New Revision: 1808733
URL: http://svn.apache.org/viewvc?rev=1808733=rev
Log:
Add launchpad api to applications in feature-applicationbuilder
Modified:
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
Modified:
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java?rev=1808733=1808732=1808733=diff
==
---
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
Mon Sep 18 15:14:42 2017
@@ -179,7 +179,7 @@ public class Main {
}
try {
-writeApplication(FeatureUtil.assembleApplication(null, am, files),
output == null ? "application.json" : output);
+
writeApplication(buildApplication(FeatureUtil.assembleApplication(null, am,
files)), output == null ? "application.json" : output);
} catch ( final IOException ioe) {
LOGGER.error("Unable to read feature/application files " +
ioe.getMessage(), ioe);
@@ -187,6 +187,19 @@ public class Main {
}
}
+private static Application buildApplication(final Application app) {
+app.getBundles().add(1, new
org.apache.sling.feature.Artifact(ArtifactId.fromMvnId("org.apache.sling/org.apache.sling.launchpad.api/1.2.0")));
+// sling.properties (TODO)
+if ( propsFile == null ) {
+
app.getFrameworkProperties().put("org.osgi.framework.bootdelegation",
"sun.*,com.sun.*");
+} else {
+
+}
+// felix framework hard coded for now
+app.setFramework(FeatureUtil.getFelixFrameworkId(null));
+return app;
+}
+
private static void writeApplication(final Application app, final String
out) {
LOGGER.info("Writing application...");
final File file = new File(out);
svn commit: r1808732 - /sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml
Author: pauls
Date: Mon Sep 18 15:14:03 2017
New Revision: 1808732
URL: http://svn.apache.org/viewvc?rev=1808732=rev
Log:
Embed converter into applicationbuilder
Modified:
sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml
Modified: sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml?rev=1808732=1808731=1808732=diff
==
--- sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml (original)
+++ sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml Mon Sep 18
15:14:03 2017
@@ -56,7 +56,7 @@
${project.build.directory}/classes
false
true
-
commons-cli,org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,slf4j-api,slf4j-simple,osgi.core
+
commons-cli,org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,slf4j-api,slf4j-simple,osgi.core,org.apache.felix.converter
@@ -112,6 +112,12 @@
1.0.0
provided
+
+org.apache.felix
+org.apache.felix.converter
+0.1.0-SNAPSHOT
+provided
+
junit
svn commit: r1808690 - /sling/whiteboard/cziegeler/pom.xml
Author: pauls Date: Mon Sep 18 12:32:19 2017 New Revision: 1808690 URL: http://svn.apache.org/viewvc?rev=1808690=rev Log: Add the application builder to the builder pom (for now) Modified: sling/whiteboard/cziegeler/pom.xml Modified: sling/whiteboard/cziegeler/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/pom.xml?rev=1808690=1808689=1808690=diff == --- sling/whiteboard/cziegeler/pom.xml (original) +++ sling/whiteboard/cziegeler/pom.xml Mon Sep 18 12:32:19 2017 @@ -63,6 +63,7 @@ feature-analyser feature-launcher feature-support +feature-applicationbuilder
svn commit: r1808660 - in /sling/whiteboard/cziegeler/feature-applicationbuilder: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/sling/ src/main
Author: pauls
Date: Sun Sep 17 22:26:51 2017
New Revision: 1808660
URL: http://svn.apache.org/viewvc?rev=1808660=rev
Log:
Add a start of an application builder - for now, it just takes features and
turns them into an application but ultimately, it should probably be where we
resolve things as well.
Added:
sling/whiteboard/cziegeler/feature-applicationbuilder/ (with props)
sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml
sling/whiteboard/cziegeler/feature-applicationbuilder/src/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
Propchange: sling/whiteboard/cziegeler/feature-applicationbuilder/
--
--- svn:ignore (added)
+++ svn:ignore Sun Sep 17 22:26:51 2017
@@ -0,0 +1,2 @@
+*.iml
+target
Added: sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml?rev=1808660=auto
==
--- sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml (added)
+++ sling/whiteboard/cziegeler/feature-applicationbuilder/pom.xml Sun Sep 17
22:26:51 2017
@@ -0,0 +1,121 @@
+
+
+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
+30
+
+
+
+org.apache.sling.feature.applicationbuilder
+0.0.1-SNAPSHOT
+
+Apache Sling Feature Application Builder
+
+A feature describes an OSGi system
+
+
+
+8
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/feature-applicationbuilder
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/feature-applicationbuilder
+
http://svn.apache.org/viewvc/sling/trunk/tooling/support/feature-applicationbuilder
+
+
+
+
+
+org.apache.maven.plugins
+maven-dependency-plugin
+
+
+unpack-dependencies
+prepare-package
+
+unpack-dependencies
+
+
+META-INF/**
+
${project.build.directory}/classes
+false
+true
+
commons-cli,org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,slf4j-api,slf4j-simple,osgi.core
+
+
+
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
+
org.apache.sling.feature.applicationbuilder.impl.Main
+
+
+
+
+
+
+
+
+
+org.osgi
+osgi.core
+
+
+org.slf4j
+slf4j-api
+
+
+org.slf4j
+slf4j-simple
+provided
+
+
+ commons-cli
+ commons-cli
+ 1.3.1
+
+
+org.apache.sling
+org.apache.sling.feature
+0.0.1-SNAPSHOT
+provided
+
+
+org.apache.sling
+org.apache.sling.feature.support
+0.0.1-SNAPSHOT
+provided
+
+
+org.apache.sling
+org.apache.sling.commons.johnzon
+1.0.0
+provided
+
+
+
+ junit
+ junit
+
+
+
Added:
sling/whiteboard/cziegeler/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-applicati
svn commit: r1808485 - in /sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl: Main.java launchers/FrameworkLauncher.java
Author: pauls
Date: Fri Sep 15 21:35:44 2017
New Revision: 1808485
URL: http://svn.apache.org/viewvc?rev=1808485=rev
Log:
Debug log startup time.
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java?rev=1808485=1808484=1808485=diff
==
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
Fri Sep 15 21:35:44 2017
@@ -127,7 +127,7 @@ public class Main {
public static void main(final String[] args) {
// setup logging
-System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug");
+System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
System.setProperty("org.slf4j.simpleLogger.showThreadName", "false");
System.setProperty("org.slf4j.simpleLogger.levelInBrackets", "true");
System.setProperty("org.slf4j.simpleLogger.showLogName", "false");
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java?rev=1808485=1808484=1808485=diff
==
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
Fri Sep 15 21:35:44 2017
@@ -72,6 +72,8 @@ public class FrameworkLauncher implement
}
Main.LOG().debug("");
}
+long time = System.currentTimeMillis();
+
final Class runnerClass =
cl.loadClass(this.getClass().getPackage().getName() + ".FrameworkRunner");
final Constructor constructor =
runnerClass.getDeclaredConstructor(Map.class, Map.class, List.class,
List.class);
constructor.setAccessible(true);
@@ -80,6 +82,7 @@ public class FrameworkLauncher implement
context.getConfigurations(),
context.getInstallableArtifacts());
+Main.LOG().debug("Startup took: " + (System.currentTimeMillis() -
time));
// nothing else to do, constructor starts everything
}
}
svn commit: r1808221 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Author: pauls
Date: Wed Sep 13 08:53:12 2017
New Revision: 1808221
URL: http://svn.apache.org/viewvc?rev=1808221=rev
Log:
Update to Felix Framework 5.6.8
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1808221=1808220=1808221=diff
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Wed Sep 13 08:53:12 2017
@@ -44,7 +44,7 @@ public class FeatureUtil {
public static ArtifactId getFelixFrameworkId(final String version) {
return new ArtifactId("org.apache.felix",
"org.apache.felix.framework",
-version != null ? version : "5.6.6", null, null);
+version != null ? version : "5.6.8", null, null);
}
static final Comparator FEATURE_PATH_COMP = new
Comparator() {
svn commit: r1808220 - /sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
Author: pauls
Date: Wed Sep 13 08:52:49 2017
New Revision: 1808220
URL: http://svn.apache.org/viewvc?rev=1808220=rev
Log:
Add run mode option.
Modified:
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
Modified:
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java?rev=1808220=1808219=1808220=diff
==
---
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
Wed Sep 13 08:52:49 2017
@@ -114,6 +114,7 @@ public class Main {
options.addOption(outputOption);
options.addOption(includeModelOption);
options.addOption(propsOption);
+options.addOption(runModeOption);
final CommandLineParser parser = new DefaultParser();
try {
svn commit: r1808190 - in /sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl: Main.java launchers/FrameworkLauncher.java
Author: pauls
Date: Tue Sep 12 23:07:30 2017
New Revision: 1808190
URL: http://svn.apache.org/viewvc?rev=1808190=rev
Log:
Do variable substitution for framework properties
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java?rev=1808190=1808189=1808190=diff
==
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
Tue Sep 12 23:07:30 2017
@@ -127,7 +127,7 @@ public class Main {
public static void main(final String[] args) {
// setup logging
-System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
+System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug");
System.setProperty("org.slf4j.simpleLogger.showThreadName", "false");
System.setProperty("org.slf4j.simpleLogger.levelInBrackets", "true");
System.setProperty("org.slf4j.simpleLogger.showLogName", "false");
@@ -232,29 +232,6 @@ public class Main {
installation.getFrameworkProperties().put(START_LEVEL_PROP, "30");
}
-if ( Main.LOG().isDebugEnabled() ) {
-Main.LOG().debug("Bundles:");
-for(final Integer key : installation.getBundleMap().keySet()) {
-Main.LOG().debug("-- Start Level {}", key);
-for(final File f : installation.getBundleMap().get(key)) {
-Main.LOG().debug(" - {}", f.getName());
-}
-}
-Main.LOG().debug("Settings: ");
-for(final Map.Entry<String, String> entry :
installation.getFrameworkProperties().entrySet()) {
-Main.LOG().debug("- {}={}", entry.getKey(), entry.getValue());
-}
-Main.LOG().debug("Configurations: ");
-for(final Object[] entry : installation.getConfigurations()) {
-if ( entry[1] != null ) {
-Main.LOG().debug("- Factory {} - {}", entry[1], entry[0]);
-} else {
-Main.LOG().debug("- {}", entry[0]);
-}
-}
-Main.LOG().debug("");
-}
-
final Launcher launcher = new FrameworkLauncher();
launcher.run(installation, createClassLoader(installation));
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java?rev=1808190=1808189=1808190=diff
==
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
Tue Sep 12 23:07:30 2017
@@ -17,11 +17,15 @@
package org.apache.sling.feature.launcher.impl.launchers;
import org.apache.sling.feature.Application;
+import org.apache.sling.feature.launcher.impl.Main;
import org.apache.sling.feature.launcher.spi.Launcher;
import org.apache.sling.feature.launcher.spi.LauncherPrepareContext;
import org.apache.sling.feature.launcher.spi.LauncherRunContext;
+import org.apache.sling.feature.support.util.SubstVarUtil;
+import java.io.File;
import java.lang.reflect.Constructor;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,10 +46,36 @@ public class FrameworkLauncher implement
*/
@Override
public void run(final LauncherRunContext context, final ClassLoader cl)
throws Exception {
+Map<String, String> properties = new HashMap<>();
+context.getFrameworkProperties().forEach((key, value) -> {
+properties.put(key, SubstVarUtil.substVars(value, key,null,
context.getFrameworkProperties()));
+});
+if ( Main.LOG().isDebugEnabled() ) {
+Main.LOG().debug("Bundles:");
+for(final Integer
svn commit: r1808189 - /sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
Author: pauls
Date: Tue Sep 12 23:06:41 2017
New Revision: 1808189
URL: http://svn.apache.org/viewvc?rev=1808189=rev
Log:
Use a util method to do variable substitution.
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java?rev=1808189=1808188=1808189=diff
==
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
Tue Sep 12 23:06:41 2017
@@ -44,6 +44,7 @@ import org.apache.sling.feature.KeyValue
import org.apache.sling.feature.analyser.BundleDescriptor;
import org.apache.sling.feature.scanner.FrameworkScanner;
import org.apache.sling.feature.support.util.PackageInfo;
+import org.apache.sling.feature.support.util.SubstVarUtil;
import org.osgi.framework.Constants;
public class FelixFrameworkScanner implements FrameworkScanner {
@@ -172,137 +173,11 @@ public class FelixFrameworkScanner imple
for(final Object name : defaultMap.keySet()) {
if ( frameworkProps.get(name.toString()) == null ) {
final String value = (String)defaultMap.get(name);
-final String substValue = substVars(value, name.toString(),
null, defaultMap);
+final String substValue = SubstVarUtil.substVars(value,
name.toString(), null, (Map) defaultMap);
frameworkProps.put(name.toString(), substValue);
}
}
return frameworkProps;
}
-
-private static final String DELIM_START = "${";
-private static final String DELIM_STOP = "}";
-
-/**
- *
- * This method performs property variable substitution on the
- * specified value. If the specified value contains the syntax
- * ${prop-name}, where prop-name
- * refers to either a configuration property or a system property,
- * then the corresponding property value is substituted for the variable
- * placeholder. Multiple variable place holders may exist in the
- * specified value as well as nested variable place holders, which
- * are substituted from inner most to outer most. Configuration
- * properties override system properties.
- *
- * @param val The string on which to perform property substitution.
- * @param currentKey The key of the property being evaluated used to
- *detect cycles.
- * @param cycleMap Map of variable references used to detect nested cycles.
- * @param configProps Set of configuration properties.
- * @return The value of the specified string after system property
substitution.
- * @throws IllegalArgumentException If there was a syntax error in the
- * property placeholder syntax or a recursive variable reference.
- **/
-private static String substVars(String val, String currentKey,
-Map<String, String> cycleMap, Properties configProps)
-throws IllegalArgumentException
-{
-// If there is currently no cycle map, then create
-// one for detecting cycles for this invocation.
-if (cycleMap == null)
-{
-cycleMap = new HashMap<>();
-}
-
-// Put the current key in the cycle map.
-cycleMap.put(currentKey, currentKey);
-
-// Assume we have a value that is something like:
-// "leading ${foo.${bar}} middle ${baz} trailing"
-
-// Find the first ending '}' variable delimiter, which
-// will correspond to the first deepest nested variable
-// placeholder.
-int stopDelim = -1;
-int startDelim = -1;
-
-do
-{
-stopDelim = val.indexOf(DELIM_STOP, stopDelim + 1);
-// If there is no stopping delimiter, then just return
-// the value since there is no variable declared.
-if (stopDelim < 0)
-{
-return val;
-}
-// Try to find the matching start delimiter by
-// looping until we find a start delimiter that is
-// greater than the stop delimiter we have found.
-startDelim = val.indexOf(DELIM_START);
-// If there is no starting delimiter, then just return
-// the value since there is no variable declared.
-if (startDelim < 0)
-{
-return val;
-}
-while (stopDelim >= 0)
-{
svn commit: r1808188 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/SubstVarUtil.java
Author: pauls
Date: Tue Sep 12 23:06:04 2017
New Revision: 1808188
URL: http://svn.apache.org/viewvc?rev=1808188=rev
Log:
Add a string variable substitution util class
Added:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/SubstVarUtil.java
Added:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/SubstVarUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/SubstVarUtil.java?rev=1808188=auto
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/SubstVarUtil.java
(added)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/SubstVarUtil.java
Tue Sep 12 23:06:04 2017
@@ -0,0 +1,149 @@
+/*
+ * 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.feature.support.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+public class SubstVarUtil {
+private static final String DELIM_START = "${";
+private static final String DELIM_STOP = "}";
+
+/**
+ *
+ * This method performs property variable substitution on the
+ * specified value. If the specified value contains the syntax
+ * ${prop-name}, where prop-name
+ * refers to either a configuration property or a system property,
+ * then the corresponding property value is substituted for the variable
+ * placeholder. Multiple variable place holders may exist in the
+ * specified value as well as nested variable place holders, which
+ * are substituted from inner most to outer most. Configuration
+ * properties override system properties.
+ *
+ * @param val The string on which to perform property substitution.
+ * @param currentKey The key of the property being evaluated used to
+ *detect cycles.
+ * @param cycleMap Map of variable references used to detect nested cycles
- may be null.
+ * @param configProps Set of configuration properties.
+ * @return The value of the specified string after system property
substitution.
+ * @throws IllegalArgumentException If there was a syntax error in the
+ * property placeholder syntax or a recursive variable reference.
+ **/
+public static String substVars(String val, String currentKey,
+Map<String, String> cycleMap, Map<String,
String> configProps)
+throws IllegalArgumentException
+{
+// If there is currently no cycle map, then create
+// one for detecting cycles for this invocation.
+if (cycleMap == null)
+{
+cycleMap = new HashMap<>();
+}
+
+// Put the current key in the cycle map.
+cycleMap.put(currentKey, currentKey);
+
+// Assume we have a value that is something like:
+// "leading ${foo.${bar}} middle ${baz} trailing"
+
+// Find the first ending '}' variable delimiter, which
+// will correspond to the first deepest nested variable
+// placeholder.
+int stopDelim = -1;
+int startDelim = -1;
+
+do
+{
+stopDelim = val.indexOf(DELIM_STOP, stopDelim + 1);
+// If there is no stopping delimiter, then just return
+// the value since there is no variable declared.
+if (stopDelim < 0)
+{
+return val;
+}
+// Try to find the matching start delimiter by
+// looping until we find a start delimiter that is
+// greater than the stop delimiter we have found.
+startDelim = val.indexOf(DELIM_START);
+// If there is no starting delimiter, then just return
+// the value since there is no variable declared.
+if (startDelim < 0)
+{
+return val;
+}
+while (stopDelim >= 0)
svn commit: r1808121 - /sling/whiteboard/cziegeler/feature-modelconverter/pom.xml
Author: pauls
Date: Tue Sep 12 14:22:15 2017
New Revision: 1808121
URL: http://svn.apache.org/viewvc?rev=1808121=rev
Log:
Embed osgi.core to be able to run standalone
Modified:
sling/whiteboard/cziegeler/feature-modelconverter/pom.xml
Modified: sling/whiteboard/cziegeler/feature-modelconverter/pom.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/pom.xml?rev=1808121=1808120=1808121=diff
==
--- sling/whiteboard/cziegeler/feature-modelconverter/pom.xml (original)
+++ sling/whiteboard/cziegeler/feature-modelconverter/pom.xml Tue Sep 12
14:22:15 2017
@@ -56,7 +56,7 @@
${project.build.directory}/classes
false
true
-
commons-cli,org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,org.apache.sling.provisioning.model,slf4j-api,slf4j-simple
+
commons-cli,org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,org.apache.sling.provisioning.model,slf4j-api,slf4j-simple,osgi.core
svn commit: r1808120 - /sling/whiteboard/cziegeler/feature-launcher/pom.xml
Author: pauls
Date: Tue Sep 12 14:22:04 2017
New Revision: 1808120
URL: http://svn.apache.org/viewvc?rev=1808120=rev
Log:
Embed osgi.core to be able to run standalone
Modified:
sling/whiteboard/cziegeler/feature-launcher/pom.xml
Modified: sling/whiteboard/cziegeler/feature-launcher/pom.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/pom.xml?rev=1808120=1808119=1808120=diff
==
--- sling/whiteboard/cziegeler/feature-launcher/pom.xml (original)
+++ sling/whiteboard/cziegeler/feature-launcher/pom.xml Tue Sep 12 14:22:04 2017
@@ -55,7 +55,7 @@
${project.build.directory}/classes
false
true
-
org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,org.apache.felix.converter,commons-cli,slf4j-api,slf4j-simple
+
org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,org.apache.felix.converter,commons-cli,slf4j-api,slf4j-simple,osgi.core
svn commit: r1808119 - /sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
Author: pauls
Date: Tue Sep 12 14:21:30 2017
New Revision: 1808119
URL: http://svn.apache.org/viewvc?rev=1808119=rev
Log:
Improve version parsing special case handling to support
._
Modified:
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
Modified:
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java?rev=1808119=1808118=1808119=diff
==
---
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
Tue Sep 12 14:21:30 2017
@@ -18,6 +18,10 @@ package org.apache.sling.feature;
import org.osgi.framework.Version;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
/**
* An artifact identifier.
*
@@ -246,13 +250,10 @@ public class ArtifactId implements Compa
*/
public Version getOSGiVersion() {
String parts[] = version.split("\\.");
-// special case for strange versions like NUMBER_NUMBER
-if ( parts.length == 1 && parts[0].indexOf('_') != -1 ) {
-final int pos = parts[0].indexOf('_');
-parts = new String[] {parts[0].substring(0, pos),
parts[0].substring(pos +1)};
-}
+
if ( parts.length < 4) {
-final int pos = parts[parts.length - 1].indexOf('-');
+
+int pos = parts[parts.length - 1].indexOf('-');
if ( pos != -1 ) {
final String[] newParts = new String[4];
newParts[0] = parts.length > 1 ? parts[0] :
parts[0].substring(0, pos);
@@ -261,6 +262,18 @@ public class ArtifactId implements Compa
newParts[3] = parts[parts.length - 1].substring(pos + 1);
parts = newParts;
}
+else {
+// special case for strange versions like NUMBER_NUMBER
+for (int i = 0; i < parts.length; i++) {
+for (pos = parts[i].indexOf('_'); pos != -1 && pos <
parts[i].length() - 1; pos = parts[i].indexOf('_')) {
+List newParts = new
ArrayList<>(Arrays.asList(parts));
+newParts.remove(i);
+newParts.add(i, parts[i].substring(0, pos));
+newParts.add(i + 1, parts[i].substring(pos + 1));
+parts = newParts.toArray(new String[0]);
+}
+}
+}
}
if ( parts.length >= 4 ) {
final int pos = parts[2].indexOf('-');
svn commit: r1808098 - /sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
Author: pauls
Date: Tue Sep 12 09:51:44 2017
New Revision: 1808098
URL: http://svn.apache.org/viewvc?rev=1808098=rev
Log:
Adapt to parameter change FeatureUtil.assembleApplication.
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
Modified:
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java?rev=1808098=1808097=1808098=diff
==
---
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
(original)
+++
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
Tue Sep 12 09:51:44 2017
@@ -59,8 +59,7 @@ public class FeatureProcessor {
}
} else {
- app = FeatureUtil.assembleApplication(null,
FeatureUtil.getFeatureFiles(config.getHomeDirectory(),
config.getFeatureFiles()),
-artifactManager);
+ app = FeatureUtil.assembleApplication(null, artifactManager,
FeatureUtil.getFeatureFiles(config.getHomeDirectory(),
config.getFeatureFiles()).toArray(new String[0]));
}
// write application back
svn commit: r1808097 - /sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
Author: pauls
Date: Tue Sep 12 09:51:16 2017
New Revision: 1808097
URL: http://svn.apache.org/viewvc?rev=1808097=rev
Log:
Adapt to parameter change FeatureUtil.assembleApplication.
Modified:
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
Modified:
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java?rev=1808097=1808096=1808097=diff
==
---
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
Tue Sep 12 09:51:16 2017
@@ -253,9 +253,9 @@ public class Main {
index++;
}
} else {
-final Application app =
FeatureUtil.assembleApplication(null, files.stream()
+final Application app =
FeatureUtil.assembleApplication(null, am, files.stream()
.map(File::getAbsolutePath)
-.collect(Collectors.toList()), am);
+.toArray(String[]::new));
convert(app, 0);
}
} catch ( final IOException ioe) {
svn commit: r1808096 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Author: pauls
Date: Tue Sep 12 09:50:21 2017
New Revision: 1808096
URL: http://svn.apache.org/viewvc?rev=1808096=rev
Log:
Wrap featureprovider in a builder context where applicable.
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1808096=1808095=1808096=diff
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Tue Sep 12 09:50:21 2017
@@ -29,6 +29,7 @@ import org.apache.sling.feature.Applicat
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.process.ApplicationBuilder;
+import org.apache.sling.feature.process.BuilderContext;
import org.apache.sling.feature.process.FeatureProvider;
import org.apache.sling.feature.support.json.FeatureJSONReader;
@@ -216,8 +217,7 @@ public class FeatureUtil {
*/
public static Application assembleApplication(
Application app,
-final List featureFiles,
-final ArtifactManager artifactManager)
+final ArtifactManager artifactManager, final String...
featureFiles)
throws IOException {
final List features = new ArrayList<>();
for(final String initFile : featureFiles) {
@@ -236,7 +236,7 @@ public class FeatureUtil {
throw new IOException("No features found.");
}
-app = ApplicationBuilder.assemble(app, new FeatureProvider() {
+app = ApplicationBuilder.assemble(app, new BuilderContext(new
FeatureProvider() {
@Override
public Feature provide(final ArtifactId id) {
@@ -252,7 +252,7 @@ public class FeatureUtil {
}
return null;
}
-}, features);
+}), features);
// check framework
if ( app.getFramework() == null ) {
svn commit: r1808095 - /sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
Author: pauls
Date: Tue Sep 12 09:50:01 2017
New Revision: 1808095
URL: http://svn.apache.org/viewvc?rev=1808095=rev
Log:
Wrap featureprovider in a builder context where applicable.
Modified:
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
Modified:
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java?rev=1808095=1808094=1808095=diff
==
---
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
(original)
+++
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
Tue Sep 12 09:50:01 2017
@@ -23,6 +23,7 @@ import org.apache.sling.feature.Artifact
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.process.BuilderContext;
import org.apache.sling.feature.process.FeatureBuilder;
import org.apache.sling.feature.process.FeatureProvider;
import org.apache.sling.feature.support.FeatureUtil;
@@ -119,12 +120,11 @@ public class Preprocessor {
}
}
-final Feature assembledFeature = FeatureBuilder.assemble(feature,
this.createFeatureProvider(env,
+final Feature assembledFeature = FeatureBuilder.assemble(feature, new
BuilderContext(this.createFeatureProvider(env,
info,
config.isTestConfig(),
config.isSkipAddDependencies(),
-config.getScope(),
-null));
+config.getScope(), null)));
if ( config.isTestConfig() ) {
info.assembledTestFeature = assembledFeature;
} else {
@@ -210,12 +210,12 @@ public class Preprocessor {
}
final List assembledFeatureList = new ArrayList<>();
for(final Feature feature : featureList) {
-final Feature assembledFeature = FeatureBuilder.assemble(feature,
this.createFeatureProvider(env,
+final Feature assembledFeature = FeatureBuilder.assemble(feature,
new BuilderContext(this.createFeatureProvider(env,
info,
config.isTestConfig(),
config.isSkipAddDependencies(),
config.getScope(),
-featureList));
+featureList)));
assembledFeatureList.add(assembledFeature);
}
if ( config.isTestConfig() ) {
@@ -258,12 +258,12 @@ public class Preprocessor {
}
final List assembledFeatureRefList = new ArrayList<>();
for(final Feature feature : featureRefList) {
-final Feature assembledFeature = FeatureBuilder.assemble(feature,
this.createFeatureProvider(env,
+final Feature assembledFeature = FeatureBuilder.assemble(feature,
new BuilderContext(this.createFeatureProvider(env,
info,
config.isTestConfig(),
config.isSkipAddDependencies(),
config.getScope(),
-featureList));
+featureList)));
assembledFeatureRefList.add(assembledFeature);
}
if ( config.isTestConfig() ) {
@@ -287,7 +287,7 @@ public class Preprocessor {
* Add all dependencies from the feature
* @param env The environment
* @param info The project info
- * @param assembleFeature The assembled feature for finding the artifacts.
+ * @param assembledFeature The assembled feature for finding the artifacts.
* @param scope The scope which the new dependencies should have
*/
private void addDependenciesFromFeature(
svn commit: r1806789 - /sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
Author: pauls Date: Thu Aug 31 13:00:30 2017 New Revision: 1806789 URL: http://svn.apache.org/viewvc?rev=1806789=rev Log: Update to latest launchpad.base 5.6.8-2.6.24 Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt?rev=1806789=1806788=1806789=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Thu Aug 31 13:00:30 2017 @@ -20,4 +20,4 @@ # Only a single artifact is allowed within this feature. # [feature name=:launchpad] -org.apache.sling/org.apache.sling.launchpad.base/5.6.6-2.6.22 +org.apache.sling/org.apache.sling.launchpad.base/5.6.8-2.6.24
svn commit: r1017520 - /websites/production/sling/content/
Author: pauls Date: Thu Aug 31 12:42:45 2017 New Revision: 1017520 Log: Apache Sling Launchpad Base 5.6.8-2.6.24 Added: websites/production/sling/content/ - copied from r1017519, websites/staging/sling/trunk/content/
svn commit: r1806788 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: pauls Date: Thu Aug 31 12:40:50 2017 New Revision: 1806788 URL: http://svn.apache.org/viewvc?rev=1806788=rev Log: Apache Sling Launchpad Base 5.6.8-2.6.24 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1806788=1806787=1806788=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Thu Aug 31 12:40:50 2017 @@ -130,7 +130,7 @@ JUnit Tests Teleporter|org.apache.sling. JUnit Health Checks|org.apache.sling.junit.healthcheck|1.0.6 Karaf repoinit|org.apache.sling.karaf-repoinit|0.2.0 Launchpad API|org.apache.sling.launchpad.api|1.1.0 -Launchpad Base|org.apache.sling.launchpad.base|5.6.6-2.6.22 +Launchpad Base|org.apache.sling.launchpad.base|5.6.8-2.6.24 Launchpad Base - Application Launcher|org.apache.sling.launchpad.base|5.6.0-2.6.16|app Launchpad Base - Web Launcher|org.apache.sling.launchpad.base|5.6.0-2.6.16|webapp|war Launchpad Content|org.apache.sling.launchpad.content|2.0.12 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1806788=1806787=1806788=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Thu Aug 31 12:40:50 2017 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Launchpad Base 5.6.8-2.6.24 (August 31st, 2017) * New Release: Apache Sling Provisioning Model 1.8.4, Apache Sling Slingstart Maven Plugin 1.7.8 (August 28th, 2017) * New Release: Apache Sling Servlets Resolver 2.4.14 (August 28th, 2017) * New Release: Apache Sling Commons Scheduler 2.7.0 (August 25th, 2017) @@ -506,4 +507,4 @@ Apache Sling Scripting Sightly JS Use Pr * Apache Sling has graduated into a top level project! (June 17, 2009) - [1]: http://s.apache.org/CVE-2012-2138 + [1]: http://s.apache.org/CVE-2012-2138 \ No newline at end of file
svn commit: r21380 - /release/sling/
Author: pauls Date: Thu Aug 31 12:35:17 2017 New Revision: 21380 Log: Add the Apache Sling Launchpad Base 5.6.8-2.6.24 release. Added: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar (with props) release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip (with props) release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.asc release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.md5 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.sha1 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar (with props) release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war (with props) release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war.asc release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war.md5 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war.sha1 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar (with props) release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom.asc release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom.md5 release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom.sha1 Removed: release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-app.jar release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-app.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-app.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-app.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-sources.jar release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-sources.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-sources.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-sources.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-webapp.war release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-webapp.war.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-webapp.war.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-webapp.war.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.pom release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.pom.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.pom.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.pom.sha1 Added: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc == --- release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc (added) +++ release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc Thu Aug 31 12:35:17 2017 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABECAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCWaQ2IwAKCRCQVII6hZpy +N9sJAKCXuXRDG9HAr+P5igHbsIu+2y+XFgCfV6B4Tn4EJADPqgN4DL/5nOQKiok= +=XFa4 +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.md5 == --- release
svn commit: r1806467 - /sling/trunk/launchpad/base/pom.xml
Author: pauls Date: Mon Aug 28 15:25:17 2017 New Revision: 1806467 URL: http://svn.apache.org/viewvc?rev=1806467=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/launchpad/base/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1806467=1806466=1806467=diff == --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Mon Aug 28 15:25:17 2017 @@ -32,7 +32,7 @@ This version is a concatenation of the framework version and a version for the launchpad base itself. For a release only the qualifier (launchpad base version) is increased. --> -5.6.8-2.6.24 +5.6.8-2.6.26-SNAPSHOT bundle Apache Sling Launchpad Base @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base +http://svn.apache.org/viewvc/sling/trunk/launchpad/base
svn commit: r1806466 - /sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24/
Author: pauls Date: Mon Aug 28 15:25:14 2017 New Revision: 1806466 URL: http://svn.apache.org/viewvc?rev=1806466=rev Log: [maven-release-plugin] copy for tag org.apache.sling.launchpad.base-5.6.8-2.6.24 Added: sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24/ (props changed) - copied from r1806465, sling/trunk/launchpad/base/ Propchange: sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24/ -- --- svn:ignore (added) +++ svn:ignore Mon Aug 28 15:25:14 2017 @@ -0,0 +1,14 @@ +target +sling +bin +logs +jackrabbit-repository +derby.log +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml Propchange: sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Aug 28 15:25:14 2017 @@ -0,0 +1 @@ +/incubator/sling/whiteboard/fmeschbe/launchpad/base:734114-735986
svn commit: r1806465 - /sling/trunk/launchpad/base/pom.xml
Author: pauls Date: Mon Aug 28 15:25:00 2017 New Revision: 1806465 URL: http://svn.apache.org/viewvc?rev=1806465=rev Log: [maven-release-plugin] prepare release org.apache.sling.launchpad.base-5.6.8-2.6.24 Modified: sling/trunk/launchpad/base/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1806465=1806464=1806465=diff == --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Mon Aug 28 15:25:00 2017 @@ -32,7 +32,7 @@ This version is a concatenation of the framework version and a version for the launchpad base itself. For a release only the qualifier (launchpad base version) is increased. --> -5.6.8-2.6.23-SNAPSHOT +5.6.8-2.6.24 bundle Apache Sling Launchpad Base @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base -http://svn.apache.org/viewvc/sling/trunk/launchpad/base + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.base-5.6.8-2.6.24
svn commit: r1806425 - /sling/trunk/launchpad/base/pom.xml
Author: pauls Date: Mon Aug 28 10:51:14 2017 New Revision: 1806425 URL: http://svn.apache.org/viewvc?rev=1806425=rev Log: SLING-7088: Update to Felix Framework 5.6.8. Modified: sling/trunk/launchpad/base/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1806425=1806424=1806425=diff == --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Mon Aug 28 10:51:14 2017 @@ -32,7 +32,7 @@ This version is a concatenation of the framework version and a version for the launchpad base itself. For a release only the qualifier (launchpad base version) is increased. --> -5.6.6-2.6.23-SNAPSHOT +5.6.8-2.6.23-SNAPSHOT bundle Apache Sling Launchpad Base @@ -253,7 +253,7 @@ org.apache.felix org.apache.felix.framework -5.6.6 +5.6.8 provided
svn commit: r1805120 - /sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt
Author: pauls Date: Tue Aug 15 22:48:30 2017 New Revision: 1805120 URL: http://svn.apache.org/viewvc?rev=1805120=rev Log: Update to Events 4.2.6 Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt?rev=1805120=1805119=1805120=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt Tue Aug 15 22:48:30 2017 @@ -20,7 +20,7 @@ [feature name=sling-event] [artifacts] -org.apache.sling/org.apache.sling.event/4.2.2 +org.apache.sling/org.apache.sling.event/4.2.6 org.apache.sling/org.apache.sling.event.dea/1.1.2 [:repoinit] @@ -39,4 +39,4 @@ user.mapping=[ "org.apache.sling.event\=sling-event", "org.apache.sling.event.dea\=sling-event" -] \ No newline at end of file +]
svn commit: r1016854 - /websites/production/sling/content/
Author: pauls Date: Tue Aug 15 22:25:39 2017 New Revision: 1016854 Log: Apache Sling Event 4.2.6 Added: websites/production/sling/content/ - copied from r1016853, websites/staging/sling/trunk/content/
svn commit: r1805118 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: pauls Date: Tue Aug 15 22:19:59 2017 New Revision: 1805118 URL: http://svn.apache.org/viewvc?rev=1805118=rev Log: Apache Sling Event 4.2.6 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1805118=1805117=1805118=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Tue Aug 15 22:19:59 2017 @@ -78,7 +78,7 @@ Distribution Integration Tests|org.apach Distribution Sample|org.apache.sling.distribution.sample|0.1.6 Dynamic Include|org.apache.sling.dynamic-include|3.0.0 Engine|org.apache.sling.engine|2.6.8 -Event|org.apache.sling.event|4.2.4 +Event|org.apache.sling.event|4.2.6 Event API|org.apache.sling.event.api|1.0.0 Explorer|org.apache.sling.extensions.explorer|1.0.4 Feature Flags|org.apache.sling.featureflags|1.2.0 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1805118=1805117=1805118=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Tue Aug 15 22:19:59 2017 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Event 4.2.6 (August 16th, 2017) * New Release: Apache Sling Default POST Servlets 2.3.22 (August 14th, 2017) * New Release: Apache Sling Parent 31 (August 8th, 2017) * New Releases: Apache Sling Security 1.1.6, Apache Sling Scripting HTL Engine 1.0.38, Apache Sling Scripting HTL Compiler 1.0.10, Apache Sling HTL Maven Plugin 1.0.8 (August 7th, 2017) @@ -500,4 +501,4 @@ Apache Sling Scripting Sightly JS Use Pr * Apache Sling has graduated into a top level project! (June 17, 2009) - [1]: http://s.apache.org/CVE-2012-2138 + [1]: http://s.apache.org/CVE-2012-2138 \ No newline at end of file
svn commit: r21178 - /release/sling/
Author: pauls Date: Tue Aug 15 22:16:39 2017 New Revision: 21178 Log: Add the Apache Sling Event 4.2.6 release. Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip (with props) release/sling/org.apache.sling.event-4.2.6-source-release.zip.asc release/sling/org.apache.sling.event-4.2.6-source-release.zip.md5 release/sling/org.apache.sling.event-4.2.6-source-release.zip.sha1 release/sling/org.apache.sling.event-4.2.6-sources.jar (with props) release/sling/org.apache.sling.event-4.2.6-sources.jar.asc release/sling/org.apache.sling.event-4.2.6-sources.jar.md5 release/sling/org.apache.sling.event-4.2.6-sources.jar.sha1 release/sling/org.apache.sling.event-4.2.6.jar (with props) release/sling/org.apache.sling.event-4.2.6.jar.asc release/sling/org.apache.sling.event-4.2.6.jar.md5 release/sling/org.apache.sling.event-4.2.6.jar.sha1 release/sling/org.apache.sling.event-4.2.6.pom release/sling/org.apache.sling.event-4.2.6.pom.asc release/sling/org.apache.sling.event-4.2.6.pom.md5 release/sling/org.apache.sling.event-4.2.6.pom.sha1 Removed: release/sling/org.apache.sling.event-4.2.4-javadoc.jar release/sling/org.apache.sling.event-4.2.4-javadoc.jar.asc release/sling/org.apache.sling.event-4.2.4-javadoc.jar.md5 release/sling/org.apache.sling.event-4.2.4-javadoc.jar.sha1 release/sling/org.apache.sling.event-4.2.4-source-release.zip release/sling/org.apache.sling.event-4.2.4-source-release.zip.asc release/sling/org.apache.sling.event-4.2.4-source-release.zip.md5 release/sling/org.apache.sling.event-4.2.4-source-release.zip.sha1 release/sling/org.apache.sling.event-4.2.4-sources.jar release/sling/org.apache.sling.event-4.2.4-sources.jar.asc release/sling/org.apache.sling.event-4.2.4-sources.jar.md5 release/sling/org.apache.sling.event-4.2.4-sources.jar.sha1 release/sling/org.apache.sling.event-4.2.4.jar release/sling/org.apache.sling.event-4.2.4.jar.asc release/sling/org.apache.sling.event-4.2.4.jar.md5 release/sling/org.apache.sling.event-4.2.4.jar.sha1 release/sling/org.apache.sling.event-4.2.4.pom release/sling/org.apache.sling.event-4.2.4.pom.asc release/sling/org.apache.sling.event-4.2.4.pom.md5 release/sling/org.apache.sling.event-4.2.4.pom.sha1 Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.event-4.2.6-source-release.zip -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip.asc == --- release/sling/org.apache.sling.event-4.2.6-source-release.zip.asc (added) +++ release/sling/org.apache.sling.event-4.2.6-source-release.zip.asc Tue Aug 15 22:16:39 2017 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABECAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCWYwtmAAKCRCQVII6hZpy +N6Y6AJsHg6z05twwin3w5twK4IOPRvUmBgCfersa4zzPBfJ5aR3KE5jLol8kCmw= +=PoLZ +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip.md5 == --- release/sling/org.apache.sling.event-4.2.6-source-release.zip.md5 (added) +++ release/sling/org.apache.sling.event-4.2.6-source-release.zip.md5 Tue Aug 15 22:16:39 2017 @@ -0,0 +1 @@ +79003b87cf9f0830e649bc7e2263a1a0 \ No newline at end of file Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip.sha1 == --- release/sling/org.apache.sling.event-4.2.6-source-release.zip.sha1 (added) +++ release/sling/org.apache.sling.event-4.2.6-source-release.zip.sha1 Tue Aug 15 22:16:39 2017 @@ -0,0 +1 @@ +d4fdbd8b904b6b94ca61bd9d255caeb2d447a736 \ No newline at end of file Added: release/sling/org.apache.sling.event-4.2.6-sources.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.event-4.2.6-sources.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.event-4.2.6-sources.jar.asc == --- release/sling/org.apache.sling.event-4.2.6-sources.jar.asc (added) +++ release/sling/org.apache.sling.event-4.2.6-sources.jar.asc Tue Aug 15 22:16:39 2017 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABECAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCWYwtmAAKCRCQVII6hZpy +N1K4AKCyslLohK2UGm1CCqHgg9wugnuengCfaklK3qYYf5hnPyq0MV8rKybze44= +=xjdq +-END PGP SIGNATURE- Added: release/sling
svn commit: r1804668 - in /sling/trunk/launchpad/base/src/main/resources: jre-1.9.properties jre-9.properties
Author: pauls Date: Thu Aug 10 12:45:02 2017 New Revision: 1804668 URL: http://svn.apache.org/viewvc?rev=1804668=rev Log: SLING-7042: use correct name for java9 system packages inclusion file as well as property. Added: sling/trunk/launchpad/base/src/main/resources/jre-9.properties (with props) Removed: sling/trunk/launchpad/base/src/main/resources/jre-1.9.properties Added: sling/trunk/launchpad/base/src/main/resources/jre-9.properties URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/resources/jre-9.properties?rev=1804668=auto == --- sling/trunk/launchpad/base/src/main/resources/jre-9.properties (added) +++ sling/trunk/launchpad/base/src/main/resources/jre-9.properties Thu Aug 10 12:45:02 2017 @@ -0,0 +1,131 @@ +# +# 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. +# + +# The file contains the Java 9 platform packages used as system packages +# for the current platform. + + + +jre-9= \ + javax.accessibility;uses:="javax.swing.text";version="0.0.0.9_JavaSE", \ + javax.activity;version="0.0.0.9_JavaSE", \ + javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.9_JavaSE", \ + javax.annotation;version="0.0.0.9_JavaSE", \ + javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.9_JavaSE", \ + javax.crypto.spec;uses:="javax.crypto";version="0.0.0.9_JavaSE", \ + javax.crypto;uses:="javax.crypto.spec";version="0.0.0.9_JavaSE", \ + javax.imageio.event;uses:="javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio.metadata;uses:="org.w3c.dom,javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio.plugins.bmp;uses:="javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio.plugins.jpeg;uses:="javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio.spi;uses:="javax.imageio.stream,javax.imageio,javax.imageio.metadata";version="0.0.0.9_JavaSE", \ + javax.imageio.stream;uses:="javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio;uses:="javax.imageio.metadata,javax.imageio.stream,javax.imageio.spi,javax.imageio.event";version="0.0.0.9_JavaSE", \ + javax.lang.model.element;uses:="javax.lang.model.type,javax.lang.model";version="0.0.0.9_JavaSE", \ + javax.lang.model.type;uses:="javax.lang.model.element,javax.lang.model";version="0.0.0.9_JavaSE", \ + javax.lang.model.util;uses:="javax.lang.model,javax.lang.model.element,javax.annotation.processing,javax.lang.model.type";version="0.0.0.9_JavaSE", \ + javax.lang.model;version="0.0.0.9_JavaSE", \ + javax.management.loading;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management.modelmbean;uses:="javax.management,javax.management.loading";version="0.0.0.9_JavaSE", \ + javax.management.monitor;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management.openmbean;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management.relation;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management.remote.rmi;uses:="javax.management.remote,javax.security.auth,javax.management,javax.management.loading,javax.naming,javax.rmi.ssl,org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,javax.rmi.CORBA,javax.rmi";version="0.0.0.9_JavaSE", \ + javax.management.remote;uses:="javax.security.auth,javax.management";version="0.0.0.9_JavaSE", \ + javax.management.timer;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management;uses:="javax.management.loading,javax.management.openmbean";version="0.0.0.9_JavaSE", \ + javax.naming.directory;uses:="javax.naming";version="0
svn commit: r1804666 - /sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Author: pauls
Date: Thu Aug 10 12:32:36 2017
New Revision: 1804666
URL: http://svn.apache.org/viewvc?rev=1804666=rev
Log:
Downgrade to o.a.s.testing.tools 1.0.16 to not have a SNAPSHOT without need
Modified:
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Modified:
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1804666=1804665=1804666=diff
==
---
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Thu Aug 10 12:32:36 2017
@@ -247,7 +247,7 @@ public abstract class AbstractJobHandlin
mavenBundle("org.apache.sling",
"org.apache.sling.jcr.oak.server", "1.1.0"),
-mavenBundle("org.apache.sling",
"org.apache.sling.testing.tools", "1.0.17-SNAPSHOT"),
+mavenBundle("org.apache.sling",
"org.apache.sling.testing.tools", "1.0.16"),
mavenBundle("org.apache.httpcomponents", "httpcore-osgi",
"4.1.2"),
mavenBundle("org.apache.httpcomponents", "httpclient-osgi",
"4.1.2"),
svn commit: r1804660 - /sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
Author: pauls Date: Thu Aug 10 10:52:11 2017 New Revision: 1804660 URL: http://svn.apache.org/viewvc?rev=1804660=rev Log: SLING-7042: Update to latest launchpad.base 5.6.6-2.6.21-SNAPSHOT to include java9 system packages. Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt?rev=1804660=1804659=1804660=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Thu Aug 10 10:52:11 2017 @@ -20,4 +20,4 @@ # Only a single artifact is allowed within this feature. # [feature name=:launchpad] -org.apache.sling/org.apache.sling.launchpad.base/5.6.6-2.6.20 +org.apache.sling/org.apache.sling.launchpad.base/5.6.6-2.6.21-SNAPSHOT
svn commit: r1804659 - /sling/trunk/launchpad/base/src/main/resources/jre-1.9.properties
Author: pauls Date: Thu Aug 10 10:46:03 2017 New Revision: 1804659 URL: http://svn.apache.org/viewvc?rev=1804659=rev Log: SLING-7042: Add jre-1.9 system packages. Added: sling/trunk/launchpad/base/src/main/resources/jre-1.9.properties (with props) Added: sling/trunk/launchpad/base/src/main/resources/jre-1.9.properties URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/resources/jre-1.9.properties?rev=1804659=auto == --- sling/trunk/launchpad/base/src/main/resources/jre-1.9.properties (added) +++ sling/trunk/launchpad/base/src/main/resources/jre-1.9.properties Thu Aug 10 10:46:03 2017 @@ -0,0 +1,131 @@ +# +# 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. +# + +# The file contains the Java 1.9 platform packages used as system packages +# for the current platform. + + + +jre-1.9= \ + javax.accessibility;uses:="javax.swing.text";version="0.0.0.9_JavaSE", \ + javax.activity;version="0.0.0.9_JavaSE", \ + javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.9_JavaSE", \ + javax.annotation;version="0.0.0.9_JavaSE", \ + javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.9_JavaSE", \ + javax.crypto.spec;uses:="javax.crypto";version="0.0.0.9_JavaSE", \ + javax.crypto;uses:="javax.crypto.spec";version="0.0.0.9_JavaSE", \ + javax.imageio.event;uses:="javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio.metadata;uses:="org.w3c.dom,javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio.plugins.bmp;uses:="javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio.plugins.jpeg;uses:="javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio.spi;uses:="javax.imageio.stream,javax.imageio,javax.imageio.metadata";version="0.0.0.9_JavaSE", \ + javax.imageio.stream;uses:="javax.imageio";version="0.0.0.9_JavaSE", \ + javax.imageio;uses:="javax.imageio.metadata,javax.imageio.stream,javax.imageio.spi,javax.imageio.event";version="0.0.0.9_JavaSE", \ + javax.lang.model.element;uses:="javax.lang.model.type,javax.lang.model";version="0.0.0.9_JavaSE", \ + javax.lang.model.type;uses:="javax.lang.model.element,javax.lang.model";version="0.0.0.9_JavaSE", \ + javax.lang.model.util;uses:="javax.lang.model,javax.lang.model.element,javax.annotation.processing,javax.lang.model.type";version="0.0.0.9_JavaSE", \ + javax.lang.model;version="0.0.0.9_JavaSE", \ + javax.management.loading;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management.modelmbean;uses:="javax.management,javax.management.loading";version="0.0.0.9_JavaSE", \ + javax.management.monitor;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management.openmbean;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management.relation;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management.remote.rmi;uses:="javax.management.remote,javax.security.auth,javax.management,javax.management.loading,javax.naming,javax.rmi.ssl,org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,javax.rmi.CORBA,javax.rmi";version="0.0.0.9_JavaSE", \ + javax.management.remote;uses:="javax.security.auth,javax.management";version="0.0.0.9_JavaSE", \ + javax.management.timer;uses:="javax.management";version="0.0.0.9_JavaSE", \ + javax.management;uses:="javax.management.loading,javax.management.openmbean";version="0.0.0.9_JavaSE", \ + javax.naming.directory;uses:="javax.naming";version="0.0.0.9_JavaSE", \ + javax.naming.event;uses:="javax.naming,javax.naming.directory";version="0.0.0.9_JavaSE", \ + java
svn commit: r1804652 - /sling/trunk/bundles/extensions/event/resource/pom.xml
Author: pauls Date: Thu Aug 10 09:46:09 2017 New Revision: 1804652 URL: http://svn.apache.org/viewvc?rev=1804652=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/event/resource/pom.xml Modified: sling/trunk/bundles/extensions/event/resource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/pom.xml?rev=1804652=1804651=1804652=diff == --- sling/trunk/bundles/extensions/event/resource/pom.xml (original) +++ sling/trunk/bundles/extensions/event/resource/pom.xml Thu Aug 10 09:46:09 2017 @@ -29,7 +29,7 @@ org.apache.sling.event bundle -4.2.6 +4.2.7-SNAPSHOT Apache Sling Event Support @@ -37,9 +37,9 @@ - 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 + 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
svn commit: r1804651 - /sling/tags/org.apache.sling.event-4.2.6/
Author: pauls Date: Thu Aug 10 09:46:07 2017 New Revision: 1804651 URL: http://svn.apache.org/viewvc?rev=1804651=rev Log: [maven-release-plugin] copy for tag org.apache.sling.event-4.2.6 Added: sling/tags/org.apache.sling.event-4.2.6/ - copied from r1804650, sling/trunk/bundles/extensions/event/resource/
svn commit: r1804650 - /sling/trunk/bundles/extensions/event/resource/pom.xml
Author: pauls Date: Thu Aug 10 09:45:53 2017 New Revision: 1804650 URL: http://svn.apache.org/viewvc?rev=1804650=rev Log: [maven-release-plugin] prepare release org.apache.sling.event-4.2.6 Modified: sling/trunk/bundles/extensions/event/resource/pom.xml Modified: sling/trunk/bundles/extensions/event/resource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/pom.xml?rev=1804650=1804649=1804650=diff == --- sling/trunk/bundles/extensions/event/resource/pom.xml (original) +++ sling/trunk/bundles/extensions/event/resource/pom.xml Thu Aug 10 09:45:53 2017 @@ -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
svn commit: r1804640 - in /sling/trunk/bundles/extensions/event/resource/src: main/java/org/apache/sling/event/impl/jobs/config/ main/java/org/apache/sling/event/impl/jobs/tasks/ test/java/org/apache/
Author: pauls
Date: Thu Aug 10 08:29:12 2017
New Revision: 1804640
URL: http://svn.apache.org/viewvc?rev=1804640=rev
Log:
SLING-7039: Clean up jobs in state dropped and errors.
Added:
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java
Modified:
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTask.java
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTask.java
Modified:
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java?rev=1804640=1804639=1804640=diff
==
---
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
(original)
+++
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
Thu Aug 10 08:29:12 2017
@@ -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.annotat
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...");
Modified:
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTask.java?rev=1804640=1804639=1804640=diff
==
---
sling/trunk/
svn commit: r1804291 - /sling/whiteboard/cziegeler/pom.xml
Author: pauls Date: Mon Aug 7 07:09:17 2017 New Revision: 1804291 URL: http://svn.apache.org/viewvc?rev=1804291=rev Log: Add builder pom Added: sling/whiteboard/cziegeler/pom.xml Added: sling/whiteboard/cziegeler/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/pom.xml?rev=1804291=auto == --- sling/whiteboard/cziegeler/pom.xml (added) +++ sling/whiteboard/cziegeler/pom.xml Mon Aug 7 07:09:17 2017 @@ -0,0 +1,68 @@ + + +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 +apache +17 + + +org.apache.sling +sling-feature-builder +pom +1-SNAPSHOT + +Apache Sling Feature (Builder) + +Pseudo project to build the complete Apache Sling Feature project. + + +2007 + + +Jira +http://issues.apache.org/jira/browse/SLING + + + + + +scm:svn:http://svn.apache.org/repos/asf/sling/whiteboard/cziegeler + + +scm:svn:https://svn.apache.org/repos/asf/sling/whiteboard/cziegeler + +http://svn.apache.org/viewvc/sling/whiteboard/cziegeler + + + +feature +feature-karaf +feature-modelconverter +osgifeature-maven-plugin +feature-analyser +feature-launcher +feature-support + + +
svn commit: r1804290 - in /sling/whiteboard/cziegeler: feature-karaf/pom.xml feature-support/pom.xml
Author: pauls Date: Mon Aug 7 07:08:59 2017 New Revision: 1804290 URL: http://svn.apache.org/viewvc?rev=1804290=rev Log: Fix name Modified: sling/whiteboard/cziegeler/feature-karaf/pom.xml sling/whiteboard/cziegeler/feature-support/pom.xml Modified: sling/whiteboard/cziegeler/feature-karaf/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-karaf/pom.xml?rev=1804290=1804289=1804290=diff == --- sling/whiteboard/cziegeler/feature-karaf/pom.xml (original) +++ sling/whiteboard/cziegeler/feature-karaf/pom.xml Mon Aug 7 07:08:59 2017 @@ -25,7 +25,7 @@ 0.0.1-SNAPSHOT bundle -Apache Sling Feature +Apache Sling Feature Karaf A feature describes an OSGi system Modified: sling/whiteboard/cziegeler/feature-support/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/pom.xml?rev=1804290=1804289=1804290=diff == --- sling/whiteboard/cziegeler/feature-support/pom.xml (original) +++ sling/whiteboard/cziegeler/feature-support/pom.xml Mon Aug 7 07:08:59 2017 @@ -24,7 +24,7 @@ 0.0.1-SNAPSHOT bundle -Apache Sling Feature Launcher +Apache Sling Feature Support Support classes for the feature tools
svn commit: r1804116 - /sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java
Author: pauls
Date: Fri Aug 4 12:54:08 2017
New Revision: 1804116
URL: http://svn.apache.org/viewvc?rev=1804116=rev
Log:
SLING-7027: Fix eta calculation for jobs and make sure we use the new eta on an
updated.
Modified:
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java
Modified:
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java?rev=1804116=1804115=1804116=diff
==
---
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java
(original)
+++
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/JobImpl.java
Fri Aug 4 12:54:08 2017
@@ -278,7 +278,7 @@ public class JobImpl implements Job, Com
final Calendar now = Calendar.getInstance();
final long elapsed = now.getTimeInMillis() -
this.getProcessingStarted().getTimeInMillis();
-final long eta = elapsed * steps / step;
+final long eta = System.currentTimeMillis() + (elapsed / current)
* (steps - current);
now.setTimeInMillis(eta);
this.setProperty(Job.PROPERTY_JOB_PROGRESS_ETA, now);
return new String[] {Job.PROPERTY_JOB_PROGRESS_STEP,
Job.PROPERTY_JOB_PROGRESS_ETA};
@@ -291,7 +291,7 @@ public class JobImpl implements Job, Com
final Date finishDate = new Date(System.currentTimeMillis() + eta
* 1000);
final Calendar finishCal = Calendar.getInstance();
finishCal.setTime(finishDate);
-this.setProperty(Job.PROPERTY_JOB_PROGRESS_ETA, eta);
+this.setProperty(Job.PROPERTY_JOB_PROGRESS_ETA, finishCal);
} else {
this.properties.remove(Job.PROPERTY_JOB_PROGRESS_ETA);
}
svn commit: r1804057 - /sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
Author: pauls Date: Thu Aug 3 22:13:51 2017 New Revision: 1804057 URL: http://svn.apache.org/viewvc?rev=1804057=rev Log: Add a missing License header. Modified: sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java Modified: sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java?rev=1804057=1804056=1804057=diff == --- sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java (original) +++ sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java Thu Aug 3 22:13:51 2017 @@ -1,3 +1,19 @@ +/* + * 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.feature.analyser; import org.apache.sling.feature.Application;
svn commit: r1804056 - in /sling/whiteboard/cziegeler/feature-analyser/src/test: ./ java/ java/org/ java/org/apache/ java/org/apache/sling/ java/org/apache/sling/feature/ java/org/apache/sling/feature
Author: pauls
Date: Thu Aug 3 22:11:27 2017
New Revision: 1804056
URL: http://svn.apache.org/viewvc?rev=1804056=rev
Log:
Add some basic (i.e., unsophisticated :-) test.
Added:
sling/whiteboard/cziegeler/feature-analyser/src/test/
sling/whiteboard/cziegeler/feature-analyser/src/test/java/
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
sling/whiteboard/cziegeler/feature-analyser/src/test/resources/
sling/whiteboard/cziegeler/feature-analyser/src/test/resources/feature_complete.json
sling/whiteboard/cziegeler/feature-analyser/src/test/resources/feature_incomplete.json
Added:
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java?rev=1804056=auto
==
---
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
(added)
+++
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
Thu Aug 3 22:11:27 2017
@@ -0,0 +1,51 @@
+package org.apache.sling.feature.analyser;
+
+import org.apache.sling.feature.Application;
+import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.support.ArtifactManager;
+import org.apache.sling.feature.support.ArtifactManagerConfig;
+import org.apache.sling.feature.support.FeatureUtil;
+import org.apache.sling.feature.support.json.FeatureJSONReader;
+import org.junit.Test;
+
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import static junit.framework.TestCase.fail;
+
+public class AnalyserTest {
+@Test
+public void testAnalyserWithCompleteFeature() throws Exception {
+final Scanner scanner = new Scanner(new ArtifactManagerConfig());
+final Analyser analyser = new Analyser(scanner);
+try ( final Reader reader = new
InputStreamReader(AnalyserTest.class.getResourceAsStream("/feature_complete.json"),
+"UTF-8") ) {
+Feature feature = FeatureJSONReader.read(reader, "feature");
+
+Application app = FeatureUtil.assembleApplication(null,
ArtifactManager.getArtifactManager(new ArtifactManagerConfig()), feature);
+
+analyser.analyse(app);
+}
+}
+
+@Test
+public void testAnalyserWithInCompleteFeature() throws Exception {
+final Scanner scanner = new Scanner(new ArtifactManagerConfig());
+final Analyser analyser = new Analyser(scanner);
+try ( final Reader reader = new
InputStreamReader(AnalyserTest.class.getResourceAsStream("/feature_incomplete.json"),
+"UTF-8") ) {
+Feature feature = FeatureJSONReader.read(reader, "feature");
+
+Application app = FeatureUtil.assembleApplication(null,
ArtifactManager.getArtifactManager(new ArtifactManagerConfig()), feature);
+
+try {
+analyser.analyse(app);
+
+fail("Expected an exception");
+}
+catch (Exception ex) {
+// Pass
+}
+}
+}
+}
Added:
sling/whiteboard/cziegeler/feature-analyser/src/test/resources/feature_complete.json
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/test/resources/feature_complete.json?rev=1804056=auto
==
---
sling/whiteboard/cziegeler/feature-analyser/src/test/resources/feature_complete.json
(added)
+++
sling/whiteboard/cziegeler/feature-analyser/src/test/resources/feature_complete.json
Thu Aug 3 22:11:27 2017
@@ -0,0 +1,31 @@
+{
+"id" : "test/test.complete/0.1",
+
+"bundles" : {
+ "1" : [
+"org.apache.sling/org.apache.sling.commons.log/5.0.0",
+"org.apache.sling/org.apache.sling.commons.logservice/1.0.6",
+"org.slf4j/jcl-over-slf4j/1.7.21",
+"org.slf4j/log4j-over-slf4j/1.7.21",
+"org.slf4j/slf4j-api/1.7.21",
+"org.apache.felix/org.apache.felix.configadmin/1.8.14"
+ ],
+ "4" : [
+"org.apache.felix/org.apache.felix.eventadmin/1.4.8",
+"org.apache.felix/org.apach
svn commit: r1804055 - /sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
Author: pauls
Date: Thu Aug 3 22:10:19 2017
New Revision: 1804055
URL: http://svn.apache.org/viewvc?rev=1804055=rev
Log:
Calculate the Capabilites provided by the framework.
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java?rev=1804055=1804054=1804055=diff
==
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
Thu Aug 3 22:10:19 2017
@@ -18,23 +18,36 @@ package org.apache.sling.feature.scanner
import org.apache.sling.commons.osgi.ManifestHeader;
import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Capability;
import org.apache.sling.feature.KeyValueMap;
import org.apache.sling.feature.analyser.Descriptor;
import org.apache.sling.feature.scanner.FrameworkScanner;
+import org.apache.sling.feature.support.util.LambdaUtil;
+import org.apache.sling.feature.support.util.ManifestParser;
+import org.apache.sling.feature.support.util.ManifestUtil;
import org.apache.sling.feature.support.util.PackageInfo;
import org.osgi.framework.Constants;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import static org.apache.sling.feature.support.util.LambdaUtil.rethrowFunction;
+import static
org.apache.sling.feature.support.util.ManifestParser.convertProvideCapabilities;
+import static
org.apache.sling.feature.support.util.ManifestParser.normalizeCapabilityClauses;
+import static
org.apache.sling.feature.support.util.ManifestParser.parseStandardHeader;
+
public class FelixFrameworkScanner implements FrameworkScanner {
@@ -48,15 +61,34 @@ public class FelixFrameworkScanner imple
return null;
}
final Set pcks = calculateSystemPackages(fwkProps);
+final Set capabilities =
calculateSystemCapabilities(fwkProps);
+
return new Descriptor() {
@Override
public Set getExportedPackages() {
return pcks;
}
+
+@Override
+public Set getCapabilities() {
+return capabilities;
+}
};
}
+private Set calculateSystemCapabilities(final KeyValueMap
fwkProps) {
+return Stream.of(
+fwkProps.get(Constants.FRAMEWORK_SYSTEMCAPABILITIES),
+fwkProps.get(Constants.FRAMEWORK_SYSTEMCAPABILITIES_EXTRA)
+)
+.filter(Objects::nonNull)
+.flatMap(
+rethrowFunction(header ->
+
convertProvideCapabilities(normalizeCapabilityClauses(parseStandardHeader(header),
"2")).stream()
+)).collect(Collectors.toSet());
+}
+
private Set calculateSystemPackages(final KeyValueMap
fwkProps) {
final String system = fwkProps.get(Constants.FRAMEWORK_SYSTEMPACKAGES);
final String extra =
fwkProps.get(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA);
svn commit: r1804054 - /sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
Author: pauls
Date: Thu Aug 3 22:09:36 2017
New Revision: 1804054
URL: http://svn.apache.org/viewvc?rev=1804054=rev
Log:
Fix message formating.
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java?rev=1804054=1804053=1804054=diff
==
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java
Thu Aug 3 22:09:36 2017
@@ -88,14 +88,14 @@ public class CheckRequirementsCapabiliti
if (candidates.isEmpty()) {
if (!CapabilityMatcher.isOptional(requirement)) {
-ctx.reportError(String.format(format,
info.toString(), entry.getKey(), "no artifact is providing a matching
capability in this start level."));
+ctx.reportError(String.format(format,
info.getArtifact().getId().getArtifactId(),
info.getArtifact().getId().getVersion(), requirement.toString(),
entry.getKey(), "no artifact is providing a matching capability in this start
level."));
}
else {
-ctx.reportWarning(String.format(format,
info.toString(), entry.getKey(), "while the requirement is optional no artifact
is providing a matching capability in this start level."));
+ctx.reportWarning(String.format(format,
info.getArtifact().getId().getArtifactId(),
info.getArtifact().getId().getVersion(), requirement.toString(),
entry.getKey(), "while the requirement is optional no artifact is providing a
matching capability in this start level."));
}
}
else if ( candidates.size() > 1 ) {
-ctx.reportWarning(String.format(format,
info.toString(), entry.getKey(), "there is more than one matching capability in
this start level."));
+ctx.reportWarning(String.format(format,
info.getArtifact().getId().getArtifactId(),
info.getArtifact().getId().getVersion(), requirement.toString(),
entry.getKey(), "there is more than one matching capability in this start
level."));
}
}
}
svn commit: r1804053 - /sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.task.AnalyserTask
Author: pauls Date: Thu Aug 3 22:08:52 2017 New Revision: 1804053 URL: http://svn.apache.org/viewvc?rev=1804053=rev Log: Add the Requirement/Capability check task to the list of provided tasks Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.task.AnalyserTask Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.task.AnalyserTask URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.task.AnalyserTask?rev=1804053=1804052=1804053=diff == --- sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.task.AnalyserTask (original) +++ sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.task.AnalyserTask Thu Aug 3 22:08:52 2017 @@ -1,4 +1,5 @@ org.apache.sling.feature.analyser.impl.CheckBundleExportsImports org.apache.sling.feature.analyser.impl.CheckBundlesForInitialContent org.apache.sling.feature.analyser.impl.CheckBundlesForResources +org.apache.sling.feature.analyser.impl.CheckRequirementsCapabilities
svn commit: r1804052 - /sling/whiteboard/cziegeler/feature-analyser/pom.xml
Author: pauls Date: Thu Aug 3 22:07:54 2017 New Revision: 1804052 URL: http://svn.apache.org/viewvc?rev=1804052=rev Log: Add the configurator as a test dependency. Modified: sling/whiteboard/cziegeler/feature-analyser/pom.xml Modified: sling/whiteboard/cziegeler/feature-analyser/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/pom.xml?rev=1804052=1804051=1804052=diff == --- sling/whiteboard/cziegeler/feature-analyser/pom.xml (original) +++ sling/whiteboard/cziegeler/feature-analyser/pom.xml Thu Aug 3 22:07:54 2017 @@ -133,5 +133,12 @@ junit junit + + +org.apache.felix +org.apache.felix.configurator +0.0.1-SNAPSHOT +test +
svn commit: r1804051 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
Author: pauls
Date: Thu Aug 3 22:06:35 2017
New Revision: 1804051
URL: http://svn.apache.org/viewvc?rev=1804051=rev
Log:
Make some util methods in ManifestParser public
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java?rev=1804051=1804050=1804051=diff
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
Thu Aug 3 22:06:35 2017
@@ -180,7 +180,7 @@ public class ManifestParser
}
-private static List convertRequireCapabilities(
+public static List convertRequireCapabilities(
List clauses)
throws BundleException
{
@@ -208,7 +208,7 @@ public class ManifestParser
return reqList;
}
-static List normalizeCapabilityClauses(
+public static List normalizeCapabilityClauses(
List clauses, String mv)
throws BundleException
{
@@ -313,7 +313,7 @@ public class ManifestParser
return clauses;
}
-static List convertProvideCapabilities(
+public static List convertProvideCapabilities(
List clauses)
throws BundleException
{
@@ -791,7 +791,7 @@ public class ManifestParser
private static final int VALUE = 16;
@SuppressWarnings({ "unchecked", "rawtypes" })
-static List parseStandardHeader(String header)
+public static List parseStandardHeader(String header)
{
List clauses = new ArrayList<>();
if (header == null)
svn commit: r1804050 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java
Author: pauls
Date: Thu Aug 3 22:06:09 2017
New Revision: 1804050
URL: http://svn.apache.org/viewvc?rev=1804050=rev
Log:
Use the directives and not the attributes to lookup filters for requirments in
Matcher.
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java?rev=1804050=1804049=1804050=diff
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java
Thu Aug 3 22:06:09 2017
@@ -497,7 +497,7 @@ public class CapabilityMatcher
public static boolean matches(Capability capability, Requirement
requirement) {
if (requirement.getNamespace().equals(capability.getNamespace())) {
-String filter = (String)
requirement.getAttributes().get(Constants.FILTER_DIRECTIVE);
+String filter = (String)
requirement.getDirectives().get(Constants.FILTER_DIRECTIVE);
if (filter != null) {
return matches(capability, SimpleFilter.parse(filter));
}
svn commit: r1804049 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Author: pauls
Date: Thu Aug 3 22:05:22 2017
New Revision: 1804049
URL: http://svn.apache.org/viewvc?rev=1804049=rev
Log:
Add a method to FeatureUtil to allow preparsed Features to be used.
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1804049=1804048=1804049=diff
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Thu Aug 3 22:05:22 2017
@@ -225,7 +225,14 @@ public class FeatureUtil {
features.add(f);
}
-if ( features.isEmpty() ) {
+return assembleApplication(app, artifactManager, features.toArray(new
Feature[0]));
+}
+
+public static Application assembleApplication(
+Application app,
+final ArtifactManager artifactManager, final Feature... features)
+throws IOException {
+if ( features.length == 0 ) {
throw new IOException("No features found.");
}
@@ -245,7 +252,7 @@ public class FeatureUtil {
}
return null;
}
-}, features.toArray(new Feature[features.size()]));
+}, features);
// check framework
if ( app.getFramework() == null ) {
svn commit: r1804048 - /sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Requirement.java
Author: pauls
Date: Thu Aug 3 22:04:02 2017
New Revision: 1804048
URL: http://svn.apache.org/viewvc?rev=1804048=rev
Log:
Add a toString to Requirement
Modified:
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Requirement.java
Modified:
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Requirement.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Requirement.java?rev=1804048=1804047=1804048=diff
==
---
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Requirement.java
(original)
+++
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Requirement.java
Thu Aug 3 22:04:02 2017
@@ -105,4 +105,9 @@ public class Requirement {
}
return true;
}
+
+@Override
+public String toString() {
+return "[Requirement namespace='" + namespace + "' attributes=" +
attributes + " directives=" + directives + "]";
+}
}
svn commit: r1016350 - /websites/production/sling/content/
Author: pauls Date: Thu Aug 3 19:02:39 2017 New Revision: 1016350 Log: Apache Sling Launchpad Base 5.6.6-2.6.20 Added: websites/production/sling/content/ - copied from r1016349, websites/staging/sling/trunk/content/
svn commit: r1804038 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Author: pauls Date: Thu Aug 3 19:01:47 2017 New Revision: 1804038 URL: http://svn.apache.org/viewvc?rev=1804038=rev Log: Update to latest resourceresolver 1.5.30 Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1804038=1804037=1804038=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Thu Aug 3 19:01:47 2017 @@ -59,7 +59,7 @@ org.apache.sling/org.apache.sling.launchpad.content/2.0.12 org.apache.sling/org.apache.sling.models.api/1.3.4 org.apache.sling/org.apache.sling.models.impl/1.4.2 -org.apache.sling/org.apache.sling.resourceresolver/1.5.28 +org.apache.sling/org.apache.sling.resourceresolver/1.5.30 org.apache.sling/org.apache.sling.serviceusermapper/1.3.4 org.apache.sling/org.apache.sling.servlets.get/2.1.26 org.apache.sling/org.apache.sling.servlets.post/2.3.20
svn commit: r1804037 - /sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
Author: pauls Date: Thu Aug 3 19:00:53 2017 New Revision: 1804037 URL: http://svn.apache.org/viewvc?rev=1804037=rev Log: Update to Launchpad Base 5.6.6-2.6.20 Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt?rev=1804037=1804036=1804037=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Thu Aug 3 19:00:53 2017 @@ -20,4 +20,4 @@ # Only a single artifact is allowed within this feature. # [feature name=:launchpad] -org.apache.sling/org.apache.sling.launchpad.base/5.6.4-2.6.18 +org.apache.sling/org.apache.sling.launchpad.base/5.6.6-2.6.20
svn commit: r1804036 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: pauls Date: Thu Aug 3 18:59:34 2017 New Revision: 1804036 URL: http://svn.apache.org/viewvc?rev=1804036=rev Log: Apache Sling Launchpad Base 5.6.6-2.6.20 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1804036=1804035=1804036=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Thu Aug 3 18:59:34 2017 @@ -130,7 +130,7 @@ JUnit Tests Teleporter|org.apache.sling. JUnit Health Checks|org.apache.sling.junit.healthcheck|1.0.6 Karaf repoinit|org.apache.sling.karaf-repoinit|0.2.0 Launchpad API|org.apache.sling.launchpad.api|1.1.0 -Launchpad Base|org.apache.sling.launchpad.base|5.6.4-2.6.18 +Launchpad Base|org.apache.sling.launchpad.base|5.6.6-2.6.20 Launchpad Base - Application Launcher|org.apache.sling.launchpad.base|5.6.0-2.6.16|app Launchpad Base - Web Launcher|org.apache.sling.launchpad.base|5.6.0-2.6.16|webapp|war Launchpad Content|org.apache.sling.launchpad.content|2.0.12 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1804036=1804035=1804036=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Thu Aug 3 18:59:34 2017 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Launchpad Base 5.6.6-2.6.20 (August 3rd, 2017) * New Release: Apache Sling Resource Resolver 1.5.30 (July 27th, 2017) * New Releases: Apache Sling Service User Mapper 1.3.4, Resource Resolver 1.5.28, JCR Base 3.0.4, and JCR Resource 3.0.4 (July 21th, 2017) * New Releases: Apache Sling File System Resource Provider 2.1.8, File System Resource Provider 1.4.8 (July 18th, 2017)
svn commit: r20755 - /release/sling/
Author: pauls Date: Thu Aug 3 18:53:27 2017 New Revision: 20755 Log: Add the Apache Sling Launchpad Base 5.6.6-2.6.20 Added: release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar (with props) release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-source-release.zip (with props) release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-source-release.zip.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-source-release.zip.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-source-release.zip.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-sources.jar (with props) release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-sources.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-sources.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-sources.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-webapp.war (with props) release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-webapp.war.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-webapp.war.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-webapp.war.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20.jar (with props) release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20.pom release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20.pom.asc release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20.pom.md5 release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20.pom.sha1 Removed: release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-app.jar release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-app.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-app.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-app.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-source-release.zip release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-source-release.zip.asc release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-source-release.zip.md5 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-source-release.zip.sha1 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-sources.jar release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-sources.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-sources.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-sources.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-webapp.war release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-webapp.war.asc release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-webapp.war.md5 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18-webapp.war.sha1 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18.jar release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18.jar.asc release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18.jar.md5 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18.jar.sha1 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18.pom release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18.pom.asc release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18.pom.md5 release/sling/org.apache.sling.launchpad.base-5.6.4-2.6.18.pom.sha1 Added: release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar.asc == --- release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar.asc (added) +++ release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar.asc Thu Aug 3 18:53:27 2017 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABECAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCWX8TxAAKCRCQVII6hZpy +N/ZMAJ0dBv+kUQonIxL6RVqTdA5mkeZQNwCdGUKqX4KPUyHlZv39jIcDGnCHx30= +=zaRa +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar.md5 == --- release/sling
svn commit: r1803629 - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ feature-support/src/main/java/org/apache/sling/feature/support/impl/ featu
Author: pauls Date: Tue Aug 1 09:13:21 2017 New Revision: 1803629 URL: http://svn.apache.org/viewvc?rev=1803629=rev Log: Add some tests for Capability and Requirements and move some util classes around. Added: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java - copied, changed from r1803628, sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/SimpleFilter.java - copied, changed from r1803628, sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/SimpleFilter.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/StringComparator.java - copied, changed from r1803628, sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/StringComparator.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/VersionRange.java - copied, changed from r1803628, sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/VersionRange.java sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/util/ sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/util/CapabilityMatcherTest.java Removed: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/ Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java sling/whiteboard/cziegeler/feature-support/src/test/resources/features/test.json Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java?rev=1803629=1803628=1803629=diff == --- sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java (original) +++ sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java Tue Aug 1 09:13:21 2017 @@ -23,7 +23,7 @@ import org.apache.sling.feature.analyser import org.apache.sling.feature.analyser.BundleDescriptor; import org.apache.sling.feature.analyser.task.AnalyserTask; import org.apache.sling.feature.analyser.task.AnalyserTaskContext; -import org.apache.sling.feature.support.impl.CapabilityMatcher; +import org.apache.sling.feature.support.util.CapabilityMatcher; import java.util.ArrayList; import java.util.List; Copied: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java (from r1803628, sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java) URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java?p2=sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java=sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java=1803628=1803629=1803629=diff == --- sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java (original) +++ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/CapabilityMatcher.java Tue Aug 1 09:13:21 2017 @@ -1,4 +1,4 @@ -package org.apache.sling.feature.support.impl; +package org.apache.sling.feature.support.util; import org.apache.sling.feature.Capability; import org.apache.sling.feature.Requirement; Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling
svn commit: r1803583 [1/2] - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/ feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ fe
Author: pauls Date: Mon Jul 31 22:01:42 2017 New Revision: 1803583 URL: http://svn.apache.org/viewvc?rev=1803583=rev Log: Optimize imports Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/Resolver.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/ResolverContext.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java sling/whiteboard/cziegeler/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Installation.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/spi/LauncherPrepareContext.java sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java sling/whiteboard/cziegeler/feature-support/src/main
svn commit: r1803583 [2/2] - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/ feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ fe
Modified: sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java?rev=1803583=1803582=1803583=diff == --- sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java (original) +++ sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java Mon Jul 31 22:01:42 2017 @@ -16,8 +16,6 @@ */ package org.apache.sling.feature.maven.mojos; -import java.io.File; - import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugins.annotations.Component; @@ -26,6 +24,8 @@ import org.apache.maven.project.MavenPro import org.apache.maven.project.MavenProjectHelper; import org.apache.sling.feature.maven.FeatureProjectConfig; +import java.io.File; + /** * Base class for all mojos. */ Modified: sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java?rev=1803583=1803582=1803583=diff == --- sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java (original) +++ sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java Mon Jul 31 22:01:42 2017 @@ -16,20 +16,20 @@ */ package org.apache.sling.feature.maven.mojos; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; - import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.sling.feature.Feature; -import org.apache.sling.feature.support.json.FeatureJSONWriter; import org.apache.sling.feature.maven.FeatureConstants; import org.apache.sling.feature.maven.ProjectHelper; +import org.apache.sling.feature.support.json.FeatureJSONWriter; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; /** * Attach the feature as a project artifact.
svn commit: r1803576 - in /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support: json/FeatureJSONReader.java json/FeatureJSONWriter.java util/ManifestParser.java u
Author: pauls
Date: Mon Jul 31 21:56:25 2017
New Revision: 1803576
URL: http://svn.apache.org/viewvc?rev=1803576=rev
Log:
Implement Attribute and Directive marshal and unmarshal.
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java?rev=1803576=1803575=1803576=diff
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
Mon Jul 31 21:56:25 2017
@@ -32,8 +32,13 @@ import org.apache.sling.feature.Capabili
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.Include;
import org.apache.sling.feature.Requirement;
+import org.apache.sling.feature.support.util.LambdaUtil;
import org.apache.sling.feature.support.util.ManifestUtil;
+import static
org.apache.sling.feature.support.util.LambdaUtil.rethrowBiConsumer;
+import static
org.apache.sling.feature.support.util.ManifestUtil.unmarshalAttribute;
+import static
org.apache.sling.feature.support.util.ManifestUtil.unmarshalDirective;
+
/**
* This class offers a method to read a {@code Feature} using a {@code Reader}
instance.
*/
@@ -284,14 +289,14 @@ public class FeatureJSONReader extends J
checkType("Requirement attributes",
obj.get(JSONConstants.REQCAP_ATTRIBUTES), Map.class);
@SuppressWarnings("unchecked")
final Map<String, Object> attrs = (Map<String,
Object>)obj.get(JSONConstants.REQCAP_ATTRIBUTES);
-attrs.forEach((key, value) ->
ManifestUtil.unmarshallAttribute(key, value, r.getAttributes()::put));
+attrs.forEach(rethrowBiConsumer((key, value) ->
unmarshalAttribute(key, value, r.getAttributes()::put)));
}
if ( obj.containsKey(JSONConstants.REQCAP_DIRECTIVES) ) {
checkType("Requirement directives",
obj.get(JSONConstants.REQCAP_DIRECTIVES), Map.class);
@SuppressWarnings("unchecked")
final Map<String, Object> dirs = (Map<String,
Object>)obj.get(JSONConstants.REQCAP_DIRECTIVES);
-dirs.forEach((key, value) ->
ManifestUtil.unmarshallDirective(key, value, r.getDirectives()::put));
+dirs.forEach(rethrowBiConsumer((key, value) ->
unmarshalDirective(key, value, r.getDirectives()::put)));
}
}
}
@@ -321,14 +326,14 @@ public class FeatureJSONReader extends J
checkType("Capability attributes",
obj.get(JSONConstants.REQCAP_ATTRIBUTES), Map.class);
@SuppressWarnings("unchecked")
final Map<String, Object> attrs = (Map<String,
Object>)obj.get(JSONConstants.REQCAP_ATTRIBUTES);
-attrs.forEach((key, value) ->
ManifestUtil.unmarshallAttribute(key, value, c.getAttributes()::put));
+attrs.forEach(rethrowBiConsumer((key, value) ->
unmarshalAttribute(key, value, c.getAttributes()::put)));
}
if ( obj.containsKey(JSONConstants.REQCAP_DIRECTIVES) ) {
checkType("Capability directives",
obj.get(JSONConstants.REQCAP_DIRECTIVES), Map.class);
@SuppressWarnings("unchecked")
final Map<String, Object> dirs = (Map<String, Object>)
obj.get(JSONConstants.REQCAP_DIRECTIVES);
-dirs.forEach((key, value) ->
ManifestUtil.unmarshallDirective(key, value, c.getDirectives()::put));
+dirs.forEach(rethrowBiConsumer((key, value) ->
unmarshalDirective(key, value, c.getDirectives()::put)));
}
}
}
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
svn commit: r1803574 - in /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl: ./ CapabilityMatcher.java SimpleFilter.java StringComparator.java VersionRang
Author: pauls
Date: Mon Jul 31 20:51:16 2017
New Revision: 1803574
URL: http://svn.apache.org/viewvc?rev=1803574=rev
Log:
Add first pass on Capability matching.
Added:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/SimpleFilter.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/StringComparator.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/VersionRange.java
Added:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java?rev=1803574=auto
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
(added)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
Mon Jul 31 20:51:16 2017
@@ -0,0 +1,621 @@
+package org.apache.sling.feature.support.impl;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.sling.feature.Capability;
+import org.apache.sling.feature.Requirement;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
+
+import static org.osgi.framework.Constants.RESOLUTION_DIRECTIVE;
+import static org.osgi.framework.Constants.RESOLUTION_OPTIONAL;
+
+/*
+ * 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.
+ */
+public class CapabilityMatcher
+{
+public static Set match(Set caps, final
SimpleFilter sf)
+{
+Set matches = Collections.newSetFromMap(new
ConcurrentHashMap<Capability, Boolean>());
+
+if (sf.getOperation() == SimpleFilter.MATCH_ALL)
+{
+matches.addAll(caps);
+}
+else if (sf.getOperation() == SimpleFilter.AND)
+{
+// Evaluate each subfilter against the remaining capabilities.
+// For AND we calculate the intersection of each subfilter.
+// We can short-circuit the AND operation if there are no
+// remaining capabilities.
+final List sfs = (List) sf.getValue();
+for (int i = 0; (caps.size() > 0) && (i < sfs.size()); i++)
+{
+matches = match(caps, sfs.get(i));
+caps = matches;
+}
+}
+else if (sf.getOperation() == SimpleFilter.OR)
+{
+// Evaluate each subfilter against the remaining capabilities.
+// For OR we calculate the union of each subfilter.
+List sfs = (List) sf.getValue();
+for (int i = 0; i < sfs.size(); i++)
+{
+matches.addAll(match(caps, sfs.get(i)));
+}
+}
+else if (sf.getOperation() == SimpleFilter.NOT)
+{
+// Evaluate each subfilter against the remaining capabilities.
+// For OR we calculate the union of each subfilter.
+matches.addAll(caps);
+List sfs = (List) sf.getValue();
+for (int i = 0; i < sfs.size(); i++)
+{
+matches.removeAll(match(caps, sfs.get(i)));
+}
+}
+else
+{
+for (Iterator it = caps.iterator(); it.hasNext(); )
+{
+Capability cap = it.next();
+Object lhs = cap.getAttributes
svn commit: r1803573 - in /sling/whiteboard/cziegeler: ./ feature-analyser/ feature-karaf/ feature-launcher/ feature-modelconverter/ feature-support/ feature/ osgifeature-maven-plugin/
Author: pauls Date: Mon Jul 31 20:49:27 2017 New Revision: 1803573 URL: http://svn.apache.org/viewvc?rev=1803573=rev Log: Add *.iml and .idea to svn ignore Modified: sling/whiteboard/cziegeler/ (props changed) sling/whiteboard/cziegeler/feature/ (props changed) sling/whiteboard/cziegeler/feature-analyser/ (props changed) sling/whiteboard/cziegeler/feature-karaf/ (props changed) sling/whiteboard/cziegeler/feature-launcher/ (props changed) sling/whiteboard/cziegeler/feature-modelconverter/ (props changed) sling/whiteboard/cziegeler/feature-support/ (props changed) sling/whiteboard/cziegeler/osgifeature-maven-plugin/ (props changed) Propchange: sling/whiteboard/cziegeler/ -- --- svn:ignore (added) +++ svn:ignore Mon Jul 31 20:49:27 2017 @@ -0,0 +1 @@ +.idea Propchange: sling/whiteboard/cziegeler/feature/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 31 20:49:27 2017 @@ -2,3 +2,4 @@ .settings target .project +*.iml Propchange: sling/whiteboard/cziegeler/feature-analyser/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 31 20:49:27 2017 @@ -2,3 +2,4 @@ .settings target .project +*.iml Propchange: sling/whiteboard/cziegeler/feature-karaf/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 31 20:49:27 2017 @@ -2,3 +2,4 @@ .settings target .project +*.iml Propchange: sling/whiteboard/cziegeler/feature-launcher/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 31 20:49:27 2017 @@ -2,3 +2,4 @@ .settings target .project +*.iml Propchange: sling/whiteboard/cziegeler/feature-modelconverter/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 31 20:49:27 2017 @@ -2,3 +2,4 @@ .settings target .project +*.iml Propchange: sling/whiteboard/cziegeler/feature-support/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 31 20:49:27 2017 @@ -2,3 +2,4 @@ .settings target .project +*.iml Propchange: sling/whiteboard/cziegeler/osgifeature-maven-plugin/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 31 20:49:27 2017 @@ -2,3 +2,4 @@ .settings target .project +*.iml
svn commit: r1803557 [1/2] - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/ feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ fe
Author: pauls Date: Mon Jul 31 17:22:58 2017 New Revision: 1803557 URL: http://svn.apache.org/viewvc?rev=1803557=rev Log: Move parsing into feature-support, add Requirement/Capability matching and parsing to feature-support, and create basic check task for Req/Cap in analyser (still needs testing). Added: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ - copied from r1803556, sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/LambdaUtil.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/PackageInfo.java sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/ sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java sling/whiteboard/cziegeler/feature-support/src/test/resources/ sling/whiteboard/cziegeler/feature-support/src/test/resources/features/ sling/whiteboard/cziegeler/feature-support/src/test/resources/features/test.json Removed: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/PackageInfo.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ManifestUtil.java sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/ sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/json/ sling/whiteboard/cziegeler/feature/src/test/resources/features/ Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/BundleDescriptor.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTask.java sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java sling/whiteboard/cziegeler/feature-support/pom.xml sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java sling/whiteboard/cziegeler/feature-support/src/main/java/org
svn commit: r1803557 [2/2] - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/ feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ fe
Added:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java?rev=1803557=auto
==
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
(added)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
Mon Jul 31 17:22:58 2017
@@ -0,0 +1,124 @@
+/*
+ * 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.feature.support.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+
+import org.apache.sling.commons.osgi.ManifestHeader;
+import org.apache.sling.feature.Capability;
+import org.apache.sling.feature.Requirement;
+import org.osgi.framework.Constants;
+
+public class ManifestUtil {
+
+/**
+ * Get the manifest from the artifact.
+ * @param artifact The file
+ * @throws IOException If the manifest can't be read
+ */
+public static Manifest getManifest(final File artifact) throws IOException
{
+try (final JarFile file = new JarFile(artifact) ) {
+return file.getManifest();
+}
+}
+
+public static List extractPackages(final Manifest m,
+final String headerName,
+final String defaultVersion,
+final boolean checkOptional) {
+final String pckInfo = m.getMainAttributes().getValue(headerName);
+if (pckInfo != null) {
+final ManifestHeader header = ManifestHeader.parse(pckInfo);
+
+final List pcks = new ArrayList<>();
+for(final ManifestHeader.Entry entry : header.getEntries()) {
+String version = entry.getAttributeValue("version");
+if ( version == null ) {
+version = defaultVersion;
+}
+boolean optional = false;
+if ( checkOptional ) {
+final String resolution =
entry.getDirectiveValue("resolution");
+optional = "optional".equalsIgnoreCase(resolution);
+}
+final PackageInfo pck = new PackageInfo(entry.getValue(),
+version,
+optional);
+pcks.add(pck);
+}
+
+return pcks;
+}
+return Collections.emptyList();
+}
+
+public static List extractExportedPackages(final Manifest m) {
+return extractPackages(m, Constants.EXPORT_PACKAGE, "0.0.0", false);
+}
+
+public static List extractImportedPackages(final Manifest m) {
+return extractPackages(m, Constants.IMPORT_PACKAGE, null, true);
+}
+
+public static List extractDynamicImportedPackages(final
Manifest m) {
+return extractPackages(m, Constants.DYNAMICIMPORT_PACKAGE, null,
false);
+}
+
+public static List extractCapabilities(ManifestParser parser) {
+return parser.getCapabilities();
+}
+
+public static List extractRequirements(ManifestParser parser)
{
+return parser.getRequirements();
+}
+
+public static void unmarshallAttribute(String key, Object value,
BiConsumer sink) {
+unmarshallAttributeOrDirective(key, value, sink);
+}
+
+public static void unmarshallDirective(String key, Object value,
BiConsumer sink) {
+unmarshallAttributeOrDirective(key, value, sink);
+}
+
+private static void unmarshallAttributeOrDirective(String key, Object
value, BiConsumer sink) {
+// TODO: parse Attribute Or Directive correctly
+sink.accept(key, value.toString());
+}
+
+public static void marshallAttribute(String key,
svn commit: r1803522 - /sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20/
Author: pauls Date: Mon Jul 31 11:24:44 2017 New Revision: 1803522 URL: http://svn.apache.org/viewvc?rev=1803522=rev Log: [maven-release-plugin] copy for tag org.apache.sling.launchpad.base-5.6.6-2.6.20 Added: sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20/ (props changed) - copied from r1803521, sling/trunk/launchpad/base/ Propchange: sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20/ -- --- svn:ignore (added) +++ svn:ignore Mon Jul 31 11:24:44 2017 @@ -0,0 +1,14 @@ +target +sling +bin +logs +jackrabbit-repository +derby.log +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml Propchange: sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jul 31 11:24:44 2017 @@ -0,0 +1 @@ +/incubator/sling/whiteboard/fmeschbe/launchpad/base:734114-735986
svn commit: r1803523 - /sling/trunk/launchpad/base/pom.xml
Author: pauls Date: Mon Jul 31 11:24:47 2017 New Revision: 1803523 URL: http://svn.apache.org/viewvc?rev=1803523=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/launchpad/base/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1803523=1803522=1803523=diff == --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Mon Jul 31 11:24:47 2017 @@ -32,7 +32,7 @@ This version is a concatenation of the framework version and a version for the launchpad base itself. For a release only the qualifier (launchpad base version) is increased. --> -5.6.6-2.6.20 +5.6.6-2.6.21-SNAPSHOT bundle Apache Sling Launchpad Base @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base +http://svn.apache.org/viewvc/sling/trunk/launchpad/base
svn commit: r1803521 - /sling/trunk/launchpad/base/pom.xml
Author: pauls Date: Mon Jul 31 11:24:30 2017 New Revision: 1803521 URL: http://svn.apache.org/viewvc?rev=1803521=rev Log: [maven-release-plugin] prepare release org.apache.sling.launchpad.base-5.6.6-2.6.20 Modified: sling/trunk/launchpad/base/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1803521=1803520=1803521=diff == --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Mon Jul 31 11:24:30 2017 @@ -32,7 +32,7 @@ This version is a concatenation of the framework version and a version for the launchpad base itself. For a release only the qualifier (launchpad base version) is increased. --> -5.6.6-2.6.19-SNAPSHOT +5.6.6-2.6.20 bundle Apache Sling Launchpad Base @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base -http://svn.apache.org/viewvc/sling/trunk/launchpad/base + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20
svn commit: r1803520 - /sling/trunk/launchpad/base/pom.xml
Author: pauls Date: Mon Jul 31 11:22:53 2017 New Revision: 1803520 URL: http://svn.apache.org/viewvc?rev=1803520=rev Log: SLING-7022: Update to Felix Framework 5.6.6. Modified: sling/trunk/launchpad/base/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1803520=1803519=1803520=diff == --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Mon Jul 31 11:22:53 2017 @@ -32,7 +32,7 @@ This version is a concatenation of the framework version and a version for the launchpad base itself. For a release only the qualifier (launchpad base version) is increased. --> -5.6.4-2.6.19-SNAPSHOT +5.6.6-2.6.19-SNAPSHOT bundle Apache Sling Launchpad Base @@ -253,7 +253,7 @@ org.apache.felix org.apache.felix.framework -5.6.4 +5.6.6 provided
svn commit: r1016026 - /websites/production/sling/content/
Author: pauls Date: Thu Jul 27 08:41:39 2017 New Revision: 1016026 Log: Apache Sling Resource Resolver 1.5.30 Added: websites/production/sling/content/ - copied from r1016025, websites/staging/sling/trunk/content/
svn commit: r1803137 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: pauls Date: Thu Jul 27 08:27:44 2017 New Revision: 1803137 URL: http://svn.apache.org/viewvc?rev=1803137=rev Log: Apache Sling Resource Resolver 1.5.30 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1803137=1803136=1803137=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Thu Jul 27 08:27:44 2017 @@ -164,7 +164,7 @@ Resource Collection|org.apache.sling.res Resource Inventory|org.apache.sling.resource.inventory|1.0.8 Resource Merger|org.apache.sling.resourcemerger|1.3.4 Resource Presence|org.apache.sling.resource.presence|0.0.2 -Resource Resolver|org.apache.sling.resourceresolver|1.5.28 +Resource Resolver|org.apache.sling.resourceresolver|1.5.30 Rewriter|org.apache.sling.rewriter|1.2.0 Failing Server-Side Tests|org.apache.sling.testing.samples.failingtests|1.0.6 Sample Integration Tests|org.apache.sling.testing.samples.integrationtests|1.0.6 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1803137=1803136=1803137=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Thu Jul 27 08:27:44 2017 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Resource Resolver 1.5.30 (July 27th, 2017) * New Releases: Apache Sling Service User Mapper 1.3.4, Resource Resolver 1.5.28, JCR Base 3.0.4, and JCR Resource 3.0.4 (July 21th, 2017) * New Releases: Apache Sling File System Resource Provider 2.1.8, File System Resource Provider 1.4.8 (July 18th, 2017) * New Releases: Apache Sling Commons Johnzon 1.1.0 (July 17th, 2017)
svn commit: r1802868 - /sling/trunk/bundles/resourceresolver/pom.xml
Author: pauls Date: Mon Jul 24 20:43:14 2017 New Revision: 1802868 URL: http://svn.apache.org/viewvc?rev=1802868=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/resourceresolver/pom.xml Modified: sling/trunk/bundles/resourceresolver/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1802868=1802867=1802868=diff == --- sling/trunk/bundles/resourceresolver/pom.xml (original) +++ sling/trunk/bundles/resourceresolver/pom.xml Mon Jul 24 20:43:14 2017 @@ -27,7 +27,7 @@ org.apache.sling.resourceresolver -1.5.30 +1.5.31-SNAPSHOT bundle Apache Sling Resource Resolver @@ -37,13 +37,13 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.5.30 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.5.30 + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourceresolver-1.5.30 +http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver
svn commit: r1802866 - /sling/trunk/bundles/resourceresolver/pom.xml
Author: pauls Date: Mon Jul 24 20:42:58 2017 New Revision: 1802866 URL: http://svn.apache.org/viewvc?rev=1802866=rev Log: [maven-release-plugin] prepare release org.apache.sling.resourceresolver-1.5.30 Modified: sling/trunk/bundles/resourceresolver/pom.xml Modified: sling/trunk/bundles/resourceresolver/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1802866=1802865=1802866=diff == --- sling/trunk/bundles/resourceresolver/pom.xml (original) +++ sling/trunk/bundles/resourceresolver/pom.xml Mon Jul 24 20:42:58 2017 @@ -27,7 +27,7 @@ org.apache.sling.resourceresolver -1.5.29-SNAPSHOT +1.5.30 bundle Apache Sling Resource Resolver @@ -37,13 +37,13 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.5.30 - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.5.30 -http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourceresolver-1.5.30 @@ -114,7 +114,7 @@ org.apache.sling org.apache.sling.serviceusermapper -1.3.5-SNAPSHOT +1.3.4 org.slf4j
svn commit: r1802867 - /sling/tags/org.apache.sling.resourceresolver-1.5.30/
Author: pauls Date: Mon Jul 24 20:43:12 2017 New Revision: 1802867 URL: http://svn.apache.org/viewvc?rev=1802867=rev Log: [maven-release-plugin] copy for tag org.apache.sling.resourceresolver-1.5.30 Added: sling/tags/org.apache.sling.resourceresolver-1.5.30/ (props changed) - copied from r1802866, sling/trunk/bundles/resourceresolver/ Propchange: sling/tags/org.apache.sling.resourceresolver-1.5.30/ -- --- svn:ignore (added) +++ svn:ignore Mon Jul 24 20:43:12 2017 @@ -0,0 +1,11 @@ +target +bin +derby.log +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml Propchange: sling/tags/org.apache.sling.resourceresolver-1.5.30/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jul 24 20:43:12 2017 @@ -0,0 +1,2 @@ +/sling/whiteboard/fmeschbe/deprecate_login_administrative/resourceresolver:1458693-1499675 +/sling/whiteboard/fmeschbe/featureflags/resourceresolver:1559092-1562000
svn commit: r1802827 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
Author: pauls
Date: Mon Jul 24 15:15:01 2017
New Revision: 1802827
URL: http://svn.apache.org/viewvc?rev=1802827=rev
Log:
SLING-7019: Improve the MapEntries class by making sure we only use the
resourceresolver while holding a lock and have not been disposed.
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java?rev=1802827=1802826=1802827=diff
==
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
Mon Jul 24 15:15:01 2017
@@ -267,7 +267,7 @@ public class MapEntries implements
try {
this.refreshResolverIfNecessary(resolverRefreshed);
-final Resource resource = resolver.getResource(path);
+final Resource resource = this.resolver != null ?
resolver.getResource(path) : null;
if (resource != null) {
boolean changed = doAddVanity(resource);
if (this.factory.isOptimizeAliasResolutionEnabled() &&
resource.getValueMap().containsKey(ResourceResolverImpl.PROP_ALIAS)) {
@@ -289,7 +289,7 @@ public class MapEntries implements
try {
this.refreshResolverIfNecessary(resolverRefreshed);
-final Resource resource = resolver.getResource(path);
+final Resource resource = this.resolver != null ?
resolver.getResource(path) : null;
if (resource != null) {
boolean changed = false;
if ( isValidVanityPath ) {
@@ -395,7 +395,7 @@ public class MapEntries implements
this.aliasMap.remove(contentPath);
}
-Resource containingResource =
this.resolver.getResource(resourcePath);
+Resource containingResource = this.resolver != null ?
this.resolver.getResource(resourcePath) : null;
if (containingResource != null) {
if
(containingResource.getValueMap().containsKey(ResourceResolverImpl.PROP_ALIAS))
{
@@ -684,8 +684,10 @@ public class MapEntries implements
this.initializing.lock();
try {
-refreshResolverIfNecessary(resolverRefreshed);
-doUpdateConfiguration();
+if (this.resolver != null) {
+refreshResolverIfNecessary(resolverRefreshed);
+doUpdateConfiguration();
+}
} finally {
this.initializing.unlock();
}
svn commit: r1802818 - in /sling/trunk/bundles/resourceresolver/src: main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java test/java/org/apache/sling/resourceresolver/impl/mapping/M
Author: pauls
Date: Mon Jul 24 14:27:32 2017
New Revision: 1802818
URL: http://svn.apache.org/viewvc?rev=1802818=rev
Log:
SLING-7018: Fix a bug that removed to many aliases in certain cases when a
resource got removed.
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java?rev=1802818=1802817=1802818=diff
==
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
Mon Jul 24 14:27:32 2017
@@ -331,7 +331,7 @@ public class MapEntries implements
if (this.factory.isOptimizeAliasResolutionEnabled()) {
for (final String contentPath : this.aliasMap.keySet()) {
if (path.startsWith(contentPath + "/") ||
path.equals(contentPath)) {
-changed |= removeAlias(contentPath, null,
resolverRefreshed);
+changed |= removeAlias(contentPath, path,
resolverRefreshed);
} else if ( contentPath.startsWith(actualContentPathPrefix) ) {
changed |= removeAlias(contentPath, path,
resolverRefreshed);
}
@@ -352,37 +352,59 @@ public class MapEntries implements
// a direct child of vanity path but not jcr:content, or a jcr:content
child of a direct child
// otherwise we can discard the event
boolean handle = true;
-String addParentPath = null;
-if ( path != null ) {
+String resourcePath = null;
+if ( path != null && path.length() > contentPath.length()) {
final String subPath = path.substring(contentPath.length() + 1);
final int firstSlash = subPath.indexOf('/');
if ( firstSlash == -1 ) {
if ( subPath.equals(JCR_CONTENT) ) {
handle = false;
}
+resourcePath = path;
} else if ( subPath.lastIndexOf('/') == firstSlash) {
if ( subPath.startsWith(JCR_CONTENT_PREFIX) ||
!subPath.endsWith(JCR_CONTENT_SUFFIX) ) {
handle = false;
}
-addParentPath = ResourceUtil.getParent(path);
+resourcePath = ResourceUtil.getParent(path);
} else {
handle = false;
}
}
+else {
+resourcePath = contentPath;
+}
if ( !handle ) {
return false;
}
this.initializing.lock();
try {
-final Map<String, String> aliasMapEntry =
aliasMap.remove(contentPath);
-if (aliasMapEntry != null && addParentPath != null ) {
+final Map<String, String> aliasMapEntry =
aliasMap.get(contentPath);
+if (aliasMapEntry != null) {
this.refreshResolverIfNecessary(resolverRefreshed);
-// we need to re-add
-// from a potential parent
-final Resource parent =
this.resolver.getResource(addParentPath);
-if ( parent != null &&
parent.getValueMap().containsKey(ResourceResolverImpl.PROP_ALIAS)) {
-doAddAlias(parent);
+
+for (Iterator<Map.Entry<String, String>> iterator =
aliasMapEntry.entrySet().iterator(); iterator.hasNext(); ) {
+final Map.Entry<String, String> entry = iterator.next();
+String prefix = contentPath.endsWith("/") ? contentPath :
contentPath + "/";
+if ((prefix + entry.getValue()).startsWith(resourcePath)){
+iterator.remove();
+}
+}
+
+if (aliasMapEntry.isEmpty()) {
+this.aliasMap.remove(contentPath);
+}
+
+Resource containingResource =
this.resolver.getResource(resourcePath);
+
+if (containingResource != null) {
+if
(containingResource.getValueMap().containsKey(ResourceResolverImpl.PROP_ALIAS))
{
+doAddAlias(containingResource);
+}
+final Resource child =
containingResource.getChild(JCR_CONTENT);
+if (child != null &&
child.getValue
