(sling-org-apache-sling-scripting-sightly) branch master updated: SLING-12179: Make i18n dependency optional (#24)
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-scripting-sightly.git
The following commit(s) were added to refs/heads/master by this push:
new fa08f60 SLING-12179: Make i18n dependency optional (#24)
fa08f60 is described below
commit fa08f6028c56779436c331790aa76601b9085d80
Author: Karl Pauls
AuthorDate: Tue Dec 5 11:32:12 2023 +0100
SLING-12179: Make i18n dependency optional (#24)
---
bnd.bnd| 1 +
.../engine/extension/I18nRuntimeExtension.java | 24 ++
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 4ab1356..1b10f37 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -8,6 +8,7 @@ Provide-Capability: io.sightly;version:Version="1.0", \\
io.sightly;version:Version="1.4"
Require-Capability: io.sightly.runtime;
filter:="(&(version>=1.0)(!(version>=2.0)))"
Import-Package:
org.apache.sling.scripting.sightly.compiler.*;resolution:=optional, \\
+org.apache.sling.i18n.*;resolution:=optional, \\
org.apache.sling.scripting.sightly.java.compiler.*;resolution:=optional, \\
org.apache.sling.commons.compiler.*;resolution:=optional,
\\
org.apache.sling.commons.classloader.*;resolution:=optional, \\
diff --git
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
index 39a8236..2f6a6b8 100644
---
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
+++
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
@@ -61,11 +61,27 @@ public class I18nRuntimeExtension implements
RuntimeExtension {
return get(bindings, text, locale, basename, hint);
}
+private volatile boolean logged;
+
+private Object getResourceBundleProvider(SlingScriptHelper
slingScriptHelper) {
+Class clazz;
+try {
+clazz =
getClass().getClassLoader().loadClass("org.apache.sling.i18n.ResourceBundleProvider");
+} catch (Throwable t) {
+if (!logged) {
+LOG.warn("i18n package not available");
+logged = true;
+}
+return null;
+}
+return slingScriptHelper.getService(clazz);
+}
+
private String get(final Bindings bindings, String text, String locale,
String basename, String hint) {
final SlingScriptHelper slingScriptHelper =
BindingsUtils.getHelper(bindings);
final SlingHttpServletRequest request =
BindingsUtils.getRequest(bindings);
-final ResourceBundleProvider resourceBundleProvider =
slingScriptHelper.getService(ResourceBundleProvider.class);
+final Object resourceBundleProvider =
getResourceBundleProvider(slingScriptHelper);
if (resourceBundleProvider != null) {
String key = text;
if (StringUtils.isNotEmpty(hint)) {
@@ -99,12 +115,12 @@ public class I18nRuntimeExtension implements
RuntimeExtension {
return text;
}
-private String getTranslation(ResourceBundleProvider
resourceBundleProvider, String basename, String key, Locale locale) {
+private String getTranslation(Object resourceBundleProvider, String
basename, String key, Locale locale) {
ResourceBundle resourceBundle;
if (StringUtils.isNotEmpty(basename)) {
-resourceBundle =
resourceBundleProvider.getResourceBundle(basename, locale);
+resourceBundle = ((ResourceBundleProvider)
resourceBundleProvider).getResourceBundle(basename, locale);
} else {
-resourceBundle = resourceBundleProvider.getResourceBundle(locale);
+resourceBundle = ((ResourceBundleProvider)
resourceBundleProvider).getResourceBundle(locale);
}
if (resourceBundle != null && resourceBundle.containsKey(key)) {
return resourceBundle.getString(key);
(sling-org-apache-sling-scripting-sightly) branch master updated: Make sling models really optional. (#25)
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-scripting-sightly.git
The following commit(s) were added to refs/heads/master by this push:
new 015b6e7 Make sling models really optional. (#25)
015b6e7 is described below
commit 015b6e735c92b0daea3b4c851a8ee62d1b26ee74
Author: Karl Pauls
AuthorDate: Tue Dec 5 11:26:48 2023 +0100
Make sling models really optional. (#25)
---
bnd.bnd| 1 -
.../impl/engine/extension/use/JavaUseProvider.java | 18 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index c4c672d..4ab1356 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -12,6 +12,5 @@ Import-Package:
org.apache.sling.scripting.sightly.compiler.*;resolution:=op
org.apache.sling.commons.compiler.*;resolution:=optional,
\\
org.apache.sling.commons.classloader.*;resolution:=optional, \\
org.apache.sling.models.*;resolution:=optional, \\
-org.apache.sling.models.*;resolution:=optional, \\
com.ibm.icu.*;resolution:=optional, \\
*
diff --git
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
index c1f70cd..5ac8979 100644
---
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
+++
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
@@ -80,8 +80,8 @@ public class JavaUseProvider implements UseProvider {
@Reference
private BundledUnitManagerImpl bundledUnitManager;
-@Reference(cardinality = ReferenceCardinality.OPTIONAL, policyOption =
ReferencePolicyOption.GREEDY)
-private ModelFactory modelFactory;
+@Reference(cardinality = ReferenceCardinality.OPTIONAL, policyOption =
ReferencePolicyOption.GREEDY, service = ModelFactory.class)
+private Object modelFactory;
@Override
public ProviderOutcome provide(String identifier, RenderContext
renderContext, Bindings arguments) {
@@ -169,23 +169,23 @@ public class JavaUseProvider implements UseProvider {
SlingHttpServletRequest request =
BindingsUtils.getRequest(globalBindings);
Resource resource = BindingsUtils.getResource(globalBindings);
// Sling Model
-if (modelFactory != null && modelFactory.isModelClass(cls)) {
+if (modelFactory != null && ((ModelFactory)
modelFactory).isModelClass(cls)) {
try {
// Attempt to instantiate via sling models
// first, try to use the provided adaptable
-if (adaptable != null &&
modelFactory.canCreateFromAdaptable(adaptable, cls)) {
+if (adaptable != null && ((ModelFactory)
modelFactory).canCreateFromAdaptable(adaptable, cls)) {
LOG.debug("Trying to instantiate class {} as Sling
Model from provided adaptable.", cls);
-return
ProviderOutcome.notNullOrFailure(modelFactory.createModel(adaptable, cls));
+return
ProviderOutcome.notNullOrFailure(((ModelFactory)
modelFactory).createModel(adaptable, cls));
}
// then, try to use the request
-if (request != null &&
modelFactory.canCreateFromAdaptable(request, cls)) {
+if (request != null && ((ModelFactory)
modelFactory).canCreateFromAdaptable(request, cls)) {
LOG.debug("Trying to instantiate class {} as Sling
Model from request.", cls);
-return
ProviderOutcome.notNullOrFailure(modelFactory.createModel(request, cls));
+return
ProviderOutcome.notNullOrFailure(((ModelFactory)
modelFactory).createModel(request, cls));
}
// finally, try to use the resource
-if (resource != null &&
modelFactory.canCreateFromAdaptable(resource, cls)) {
+if (resource != null && ((ModelFactory)
modelFactory).canCreateFromAdaptable(resource, cls)) {
LOG.debug("Trying to instantiate class {} as Sling
Model from resource.", cls);
-return
ProviderOutcome.notNullOrFailure(modelFactory.createModel(resource, cls));
+return
ProviderOutcome.notNullOrFailure(((ModelFactory)
modelFactory).createModel(resource, cls));
}
return ProviderOutcome.failure(
new IllegalStateException("Could not adapt the
given Sling Model from neither request nor resource: " + cls));
(sling-org-apache-sling-scripting-sightly) branch modelsoptional created (now 8e4c251)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch modelsoptional in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly.git at 8e4c251 Make sling models really optional. This branch includes the following new commits: new 8e4c251 Make sling models really optional. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(sling-org-apache-sling-scripting-sightly) 01/01: Make sling models really optional.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch modelsoptional
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly.git
commit 8e4c25123ec803199f7fb936eb06edd655e6c9db
Author: Karl Pauls
AuthorDate: Tue Dec 5 10:31:19 2023 +0100
Make sling models really optional.
---
bnd.bnd| 1 -
.../impl/engine/extension/use/JavaUseProvider.java | 18 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index c4c672d..4ab1356 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -12,6 +12,5 @@ Import-Package:
org.apache.sling.scripting.sightly.compiler.*;resolution:=op
org.apache.sling.commons.compiler.*;resolution:=optional,
\\
org.apache.sling.commons.classloader.*;resolution:=optional, \\
org.apache.sling.models.*;resolution:=optional, \\
-org.apache.sling.models.*;resolution:=optional, \\
com.ibm.icu.*;resolution:=optional, \\
*
diff --git
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
index c1f70cd..5ac8979 100644
---
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
+++
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
@@ -80,8 +80,8 @@ public class JavaUseProvider implements UseProvider {
@Reference
private BundledUnitManagerImpl bundledUnitManager;
-@Reference(cardinality = ReferenceCardinality.OPTIONAL, policyOption =
ReferencePolicyOption.GREEDY)
-private ModelFactory modelFactory;
+@Reference(cardinality = ReferenceCardinality.OPTIONAL, policyOption =
ReferencePolicyOption.GREEDY, service = ModelFactory.class)
+private Object modelFactory;
@Override
public ProviderOutcome provide(String identifier, RenderContext
renderContext, Bindings arguments) {
@@ -169,23 +169,23 @@ public class JavaUseProvider implements UseProvider {
SlingHttpServletRequest request =
BindingsUtils.getRequest(globalBindings);
Resource resource = BindingsUtils.getResource(globalBindings);
// Sling Model
-if (modelFactory != null && modelFactory.isModelClass(cls)) {
+if (modelFactory != null && ((ModelFactory)
modelFactory).isModelClass(cls)) {
try {
// Attempt to instantiate via sling models
// first, try to use the provided adaptable
-if (adaptable != null &&
modelFactory.canCreateFromAdaptable(adaptable, cls)) {
+if (adaptable != null && ((ModelFactory)
modelFactory).canCreateFromAdaptable(adaptable, cls)) {
LOG.debug("Trying to instantiate class {} as Sling
Model from provided adaptable.", cls);
-return
ProviderOutcome.notNullOrFailure(modelFactory.createModel(adaptable, cls));
+return
ProviderOutcome.notNullOrFailure(((ModelFactory)
modelFactory).createModel(adaptable, cls));
}
// then, try to use the request
-if (request != null &&
modelFactory.canCreateFromAdaptable(request, cls)) {
+if (request != null && ((ModelFactory)
modelFactory).canCreateFromAdaptable(request, cls)) {
LOG.debug("Trying to instantiate class {} as Sling
Model from request.", cls);
-return
ProviderOutcome.notNullOrFailure(modelFactory.createModel(request, cls));
+return
ProviderOutcome.notNullOrFailure(((ModelFactory)
modelFactory).createModel(request, cls));
}
// finally, try to use the resource
-if (resource != null &&
modelFactory.canCreateFromAdaptable(resource, cls)) {
+if (resource != null && ((ModelFactory)
modelFactory).canCreateFromAdaptable(resource, cls)) {
LOG.debug("Trying to instantiate class {} as Sling
Model from resource.", cls);
-return
ProviderOutcome.notNullOrFailure(modelFactory.createModel(resource, cls));
+return
ProviderOutcome.notNullOrFailure(((ModelFactory)
modelFactory).createModel(resource, cls));
}
return ProviderOutcome.failure(
new IllegalStateException("Could not adapt the
given Sling Model from neither request nor resource: " + cls));
(sling-org-apache-sling-scripting-sightly) branch i18n updated (b6ed3a6 -> 129d8ae)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch i18n in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly.git from b6ed3a6 Make i18n dependency optional add 129d8ae log only one time No new revisions were added by this update. Summary of changes: .../sightly/impl/engine/extension/I18nRuntimeExtension.java| 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-)
(sling-org-apache-sling-xss) branch master updated (d6078f4 -> 16bb365)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
from d6078f4 [maven-release-plugin] prepare for next development iteration
add 3b651d3 Make commons metrics optional
new 16bb365 Merge pull request #41 from apache/Metrics
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bnd.bnd| 1 +
.../org/apache/sling/xss/impl/XSSFilterImpl.java | 12 +
...SanitizedResult.java => XSSMetricsService.java} | 29 +-
3 files changed, 25 insertions(+), 17 deletions(-)
copy src/main/java/org/apache/sling/xss/impl/{SanitizedResult.java =>
XSSMetricsService.java} (58%)
(sling-org-apache-sling-xss) 01/01: Merge pull request #41 from apache/Metrics
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-xss.git commit 16bb365c0116374c2a17340242189afb8ad38cd4 Merge: d6078f4 3b651d3 Author: Karl Pauls AuthorDate: Tue Dec 5 10:09:22 2023 +0100 Merge pull request #41 from apache/Metrics Make commons metrics optional bnd.bnd| 1 + .../org/apache/sling/xss/impl/XSSFilterImpl.java | 12 --- .../apache/sling/xss/impl/XSSMetricsService.java | 40 ++ 3 files changed, 48 insertions(+), 5 deletions(-)
(sling-org-apache-sling-xss) branch Metrics created (now 3b651d3)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch Metrics in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git at 3b651d3 Make commons metrics optional This branch includes the following new commits: new 3b651d3 Make commons metrics optional The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(sling-org-apache-sling-xss) 01/01: Make commons metrics optional
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch Metrics
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
commit 3b651d39d6e3a4ab8c7ec4b7acad0c4e4bdcad19
Author: Karl Pauls
AuthorDate: Tue Dec 5 01:10:35 2023 +0100
Make commons metrics optional
---
bnd.bnd| 1 +
.../org/apache/sling/xss/impl/XSSFilterImpl.java | 12 ---
.../apache/sling/xss/impl/XSSMetricsService.java | 40 ++
3 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 6ff8d06..1c193b8 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -31,6 +31,7 @@ Import-Package: !bsh, \
!javax.servlet.jsp, \
!javax.servlet.jsp.tagext, \
!sun.io, \
+org.apache.sling.commons.metrics.*;resolution:=optional, \
*
Private-Package: org.apache.sling.xss.impl, \
org.apache.batik.*, \
diff --git a/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java
b/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java
index 86d9880..98f4c3d 100644
--- a/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java
+++ b/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
+import java.util.Optional;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
@@ -53,6 +54,9 @@ import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.Designate;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@@ -179,13 +183,12 @@ public class XSSFilterImpl implements XSSFilter {
@Reference
private ServiceUserMapped serviceUserMapped;
-@Reference
-private MetricsService metricsService;
+@Reference(policy=ReferencePolicy.DYNAMIC, cardinality =
ReferenceCardinality.OPTIONAL, policyOption = ReferencePolicyOption.GREEDY)
+private volatile XSSMetricsService metricsService;
@Reference
private XSSStatusService statusService;
-private Counter invalidHrefs;
private static final String COUNTER_INVALID_HREFS = "xss.invalid_hrefs";
@Override
@@ -253,7 +256,7 @@ public class XSSFilterImpl implements XSSFilter {
}
if (!isValid) {
statusService.reportInvalidUrl(url);
-invalidHrefs.increment();
+Optional.ofNullable(metricsService).ifPresent(service ->
service.invalidHref());
}
return isValid;
}
@@ -261,7 +264,6 @@ public class XSSFilterImpl implements XSSFilter {
@Activate
@Modified
protected void activate(ComponentContext componentContext, Configuration
configuration) {
-invalidHrefs = metricsService.counter(COUNTER_INVALID_HREFS);
// load default handler
policyPath = configuration.policyPath();
updatePolicy();
diff --git a/src/main/java/org/apache/sling/xss/impl/XSSMetricsService.java
b/src/main/java/org/apache/sling/xss/impl/XSSMetricsService.java
new file mode 100644
index 000..a4ecf8b
--- /dev/null
+++ b/src/main/java/org/apache/sling/xss/impl/XSSMetricsService.java
@@ -0,0 +1,40 @@
+/***
+ * 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.xss.impl;
+
+import org.apache.sling.commons.metrics.Counter;
+import org.apache.sling.commons.metrics.MetricsService;
+import org.osgi.service.compon
(sling-org-apache-sling-scripting-sightly) 01/01: Make i18n dependency optional
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch i18n
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly.git
commit b6ed3a6972d78b29da8138829ef20a4c883b9f38
Author: Karl Pauls
AuthorDate: Mon Dec 4 22:34:42 2023 +0100
Make i18n dependency optional
---
bnd.bnd | 1 +
.../impl/engine/extension/I18nRuntimeExtension.java | 19 +++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index c4c672d..ed75b62 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -8,6 +8,7 @@ Provide-Capability: io.sightly;version:Version="1.0", \\
io.sightly;version:Version="1.4"
Require-Capability: io.sightly.runtime;
filter:="(&(version>=1.0)(!(version>=2.0)))"
Import-Package:
org.apache.sling.scripting.sightly.compiler.*;resolution:=optional, \\
+org.apache.sling.i18n.*;resolution:=optional, \\
org.apache.sling.scripting.sightly.java.compiler.*;resolution:=optional, \\
org.apache.sling.commons.compiler.*;resolution:=optional,
\\
org.apache.sling.commons.classloader.*;resolution:=optional, \\
diff --git
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
index 39a8236..02f79a2 100644
---
a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
+++
b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
@@ -61,11 +61,22 @@ public class I18nRuntimeExtension implements
RuntimeExtension {
return get(bindings, text, locale, basename, hint);
}
+private Object getResourceBundleProvider(SlingScriptHelper
slingScriptHelper) {
+Class clazz;
+try {
+clazz =
getClass().getClassLoader().loadClass("org.apache.sling.i18n.ResourceBundleProvider");
+} catch (Throwable t) {
+LOG.warn("i18n package not available");
+return null;
+}
+return slingScriptHelper.getService(clazz);
+}
+
private String get(final Bindings bindings, String text, String locale,
String basename, String hint) {
final SlingScriptHelper slingScriptHelper =
BindingsUtils.getHelper(bindings);
final SlingHttpServletRequest request =
BindingsUtils.getRequest(bindings);
-final ResourceBundleProvider resourceBundleProvider =
slingScriptHelper.getService(ResourceBundleProvider.class);
+final Object resourceBundleProvider =
getResourceBundleProvider(slingScriptHelper);
if (resourceBundleProvider != null) {
String key = text;
if (StringUtils.isNotEmpty(hint)) {
@@ -99,12 +110,12 @@ public class I18nRuntimeExtension implements
RuntimeExtension {
return text;
}
-private String getTranslation(ResourceBundleProvider
resourceBundleProvider, String basename, String key, Locale locale) {
+private String getTranslation(Object resourceBundleProvider, String
basename, String key, Locale locale) {
ResourceBundle resourceBundle;
if (StringUtils.isNotEmpty(basename)) {
-resourceBundle =
resourceBundleProvider.getResourceBundle(basename, locale);
+resourceBundle = ((ResourceBundleProvider)
resourceBundleProvider).getResourceBundle(basename, locale);
} else {
-resourceBundle = resourceBundleProvider.getResourceBundle(locale);
+resourceBundle = ((ResourceBundleProvider)
resourceBundleProvider).getResourceBundle(locale);
}
if (resourceBundle != null && resourceBundle.containsKey(key)) {
return resourceBundle.getString(key);
(sling-org-apache-sling-scripting-sightly) branch i18n created (now b6ed3a6)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch i18n in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly.git at b6ed3a6 Make i18n dependency optional This branch includes the following new commits: new b6ed3a6 Make i18n dependency optional The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(sling-org-apache-sling-scripting-core) branch master updated: SLING-12057: Replace commons.threads with Executor and embed commons.compiler.source
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-scripting-core.git
The following commit(s) were added to refs/heads/master by this push:
new ef9e8d5 SLING-12057: Replace commons.threads with Executor and embed
commons.compiler.source
ef9e8d5 is described below
commit ef9e8d55b2bda8e96c7716d9de1c3f2fc588d8da
Author: Karl Pauls
AuthorDate: Mon Dec 4 15:07:57 2023 +0100
SLING-12057: Replace commons.threads with Executor and embed
commons.compiler.source
---
bnd.bnd| 2 +-
.../sling/scripting/core/impl/ScriptCacheImpl.java | 18 +++---
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 80c64c7..20f9145 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -3,7 +3,7 @@ Import-Package:\
*
Conditional-Package:\
- org.apache.felix.utils.json.*
+ org.apache.felix.utils.json.*,org.apache.sling.commons.compiler.source.*
-exportcontents: ${packages;VERSIONED}
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
index 579e11f..ae93f4a 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
@@ -27,6 +27,9 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -39,8 +42,6 @@ import
org.apache.sling.api.resource.observation.ExternalResourceChangeListener;
import org.apache.sling.api.resource.observation.ResourceChange;
import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
import org.apache.sling.api.resource.observation.ResourceChangeListener;
-import org.apache.sling.commons.threads.ThreadPool;
-import org.apache.sling.commons.threads.ThreadPoolManager;
import org.apache.sling.scripting.api.CachedScript;
import org.apache.sling.scripting.api.ScriptCache;
import org.apache.sling.scripting.core.impl.helper.CachingMap;
@@ -91,13 +92,11 @@ public class ScriptCacheImpl implements ScriptCache,
ResourceChangeListener, Ext
@Reference
private ResourceResolverFactory rrf;
-@Reference
-private ThreadPoolManager threadPoolManager;
@Reference
private SlingScriptEngineManager slingScriptEngineManager;
-private ThreadPool threadPool;
+private volatile ExecutorService threadPool;
private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
private final Lock readLock = rwl.readLock();
private final Lock writeLock = rwl.writeLock();
@@ -201,7 +200,7 @@ public class ScriptCacheImpl implements ScriptCache,
ResourceChangeListener, Ext
@Activate
protected void activate(ScriptCacheImplConfiguration configuration,
BundleContext bundleCtx) {
-threadPool = threadPoolManager.get("Script Cache Thread Pool");
+threadPool = Executors.newSingleThreadExecutor();
bundleContext = bundleCtx;
additionalExtensions =
configuration.org_apache_sling_scripting_cache_additional__extensions();
int newMaxCacheSize =
configuration.org_apache_sling_scripting_cache_size();
@@ -260,7 +259,12 @@ public class ScriptCacheImpl implements ScriptCache,
ResourceChangeListener, Ext
resourceChangeListener = null;
}
if (threadPool != null) {
-threadPoolManager.release(threadPool);
+threadPool.shutdown();
+try {
+threadPool.awaitTermination(1, TimeUnit.SECONDS);
+} catch (InterruptedException e) {
+logger.warn("Unable to shutdown script cache thread in
time");
+}
threadPool = null;
}
active = false;
(sling-org-apache-sling-scripting-core) branch SLING-12057 created (now 0f6f843)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch SLING-12057 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git at 0f6f843 SLING-12057: Replace commons.threads with Executor and embed commons.compiler.source This branch includes the following new commits: new 0f6f843 SLING-12057: Replace commons.threads with Executor and embed commons.compiler.source The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(sling-org-apache-sling-scripting-core) 01/01: SLING-12057: Replace commons.threads with Executor and embed commons.compiler.source
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch SLING-12057
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
commit 0f6f8438927bd01e8fd0e6e42afaa55cbf9aee83
Author: Karl Pauls
AuthorDate: Mon Dec 4 15:07:57 2023 +0100
SLING-12057: Replace commons.threads with Executor and embed
commons.compiler.source
---
bnd.bnd| 2 +-
.../sling/scripting/core/impl/ScriptCacheImpl.java | 18 +++---
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 80c64c7..20f9145 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -3,7 +3,7 @@ Import-Package:\
*
Conditional-Package:\
- org.apache.felix.utils.json.*
+ org.apache.felix.utils.json.*,org.apache.sling.commons.compiler.source.*
-exportcontents: ${packages;VERSIONED}
diff --git
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
index 579e11f..ae93f4a 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
@@ -27,6 +27,9 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -39,8 +42,6 @@ import
org.apache.sling.api.resource.observation.ExternalResourceChangeListener;
import org.apache.sling.api.resource.observation.ResourceChange;
import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
import org.apache.sling.api.resource.observation.ResourceChangeListener;
-import org.apache.sling.commons.threads.ThreadPool;
-import org.apache.sling.commons.threads.ThreadPoolManager;
import org.apache.sling.scripting.api.CachedScript;
import org.apache.sling.scripting.api.ScriptCache;
import org.apache.sling.scripting.core.impl.helper.CachingMap;
@@ -91,13 +92,11 @@ public class ScriptCacheImpl implements ScriptCache,
ResourceChangeListener, Ext
@Reference
private ResourceResolverFactory rrf;
-@Reference
-private ThreadPoolManager threadPoolManager;
@Reference
private SlingScriptEngineManager slingScriptEngineManager;
-private ThreadPool threadPool;
+private volatile ExecutorService threadPool;
private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
private final Lock readLock = rwl.readLock();
private final Lock writeLock = rwl.writeLock();
@@ -201,7 +200,7 @@ public class ScriptCacheImpl implements ScriptCache,
ResourceChangeListener, Ext
@Activate
protected void activate(ScriptCacheImplConfiguration configuration,
BundleContext bundleCtx) {
-threadPool = threadPoolManager.get("Script Cache Thread Pool");
+threadPool = Executors.newSingleThreadExecutor();
bundleContext = bundleCtx;
additionalExtensions =
configuration.org_apache_sling_scripting_cache_additional__extensions();
int newMaxCacheSize =
configuration.org_apache_sling_scripting_cache_size();
@@ -260,7 +259,12 @@ public class ScriptCacheImpl implements ScriptCache,
ResourceChangeListener, Ext
resourceChangeListener = null;
}
if (threadPool != null) {
-threadPoolManager.release(threadPool);
+threadPool.shutdown();
+try {
+threadPool.awaitTermination(1, TimeUnit.SECONDS);
+} catch (InterruptedException e) {
+logger.warn("Unable to shutdown script cache thread in
time");
+}
threadPool = null;
}
active = false;
(sling-whiteboard) 03/03: Add a weaver that allows to weave references to get classloader
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-whiteboard.git
commit 4aebf335eaf28705c7fdae78ca7a4515075e4ef7
Author: Karl Pauls
AuthorDate: Fri Dec 1 10:15:22 2023 +0100
Add a weaver that allows to weave references to get classloader
---
atomosfeaturelauncherweaver/pom.xml| 82 +++
.../launcher/atomos/weaver/AtomosWeaver.java | 25 +
.../sling/feature/launcher/atomos/weaver/Test.java | 64
.../atomos/weaver/impl/AtomosWeaverImpl.java | 28 +
.../atomos/weaver/impl/AtomosWeaverVisitor.java| 115 +
.../atomos/weaver/impl/StaticToolClassWriter.java | 72 +
.../feature/launcher/atomos/weaver/main/Main.java | 71 +
...ing.feature.launcher.atomos.weaver.AtomosWeaver | 1 +
8 files changed, 458 insertions(+)
diff --git a/atomosfeaturelauncherweaver/pom.xml
b/atomosfeaturelauncherweaver/pom.xml
new file mode 100644
index ..502f018f
--- /dev/null
+++ b/atomosfeaturelauncherweaver/pom.xml
@@ -0,0 +1,82 @@
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+4.0.0
+
+
+org.apache.sling
+sling-bundle-parent
+35
+
+
+
+org.apache.sling.feature.launcher.atomos.weaver
+Apache Sling Atomos feature launcher weaver
+
+0.0.1-SNAPSHOT
+
+11
+
+
+
+
+biz.aQute.bnd
+bnd-baseline-maven-plugin
+
+false
+
+
+
+org.apache.rat
+apache-rat-plugin
+
+
+readme.md
+
src/main/resources/META-INF/services/**
+**/*.properties
+launcher/**
+**/*.patch
+
+
+
+
+
+
+
+org.ow2.asm
+asm
+9.4
+
+
+org.ow2.asm
+asm-commons
+9.4
+
+
+org.ow2.asm
+asm-util
+9.4
+
+
+
+
diff --git
a/atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/AtomosWeaver.java
b/atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/AtomosWeaver.java
new file mode 100644
index ..379ff7e0
--- /dev/null
+++
b/atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/AtomosWeaver.java
@@ -0,0 +1,25 @@
+/*~~
+ ~ 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.launcher.atomos.weaver;
+
+import java.lang.reflect.Method;
+
+public interface AtomosWeaver {
+byte[] weave(byte[] bytes, String targetClass, String
targetMethodClassLoader, String targetMethodResource, String
targetMethodStream, ClassLoader cl);
+}
diff --git
a/atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/Test.java
b/atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/Test.java
new file mode 100644
index ..815ad2e2
--- /dev/null
+++
b/atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/Test.java
@@ -0,0 +1,64 @@
+/*~~
+ ~ 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 L
(sling-whiteboard) 01/03: Add docker support and some experimentation with a weaver
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-whiteboard.git commit 389e459a898ad4a699c7e35afc429344fde81eb9 Author: Karl Pauls AuthorDate: Fri Dec 1 10:12:33 2023 +0100 Add docker support and some experimentation with a weaver --- atomosfeaturelauncher/Dockerfile | 21 + atomosfeaturelauncher/build.sh | 23 + atomosfeaturelauncher/pom.xml | 131 +++- .../src/main/features/feature.json | 732 + .../feature/launcher/atomos/AtomosLauncher.java| 62 +- .../feature/launcher/atomos/AtomosRunner.java | 128 +++- 6 files changed, 962 insertions(+), 135 deletions(-) diff --git a/atomosfeaturelauncher/Dockerfile b/atomosfeaturelauncher/Dockerfile new file mode 100644 index ..445e3bbb --- /dev/null +++ b/atomosfeaturelauncher/Dockerfile @@ -0,0 +1,21 @@ +FROM ghcr.io/graalvm/native-image:ol8-java17-22.3.3 as native + +COPY target/artifacts artifacts +COPY --chmod=777 build.sh build.sh +COPY target/atomos-config/atomos_init.sh atomos_init.sh +COPY target/atomos-config/resource-config.json resource-config.json +COPY target/atomos-config/reflect-config.json reflect-config.json +COPY target/atomos-config/proxy-config.json proxy-config.json +COPY target/atomos-config/jni-config.json jni-config.json +COPY target/atomos-config/serialization-config.json serialization-config.json +COPY target/atomos-config/atomos.substrate.jar atomos.substrate.jar + +RUN ./build.sh "-H:+StaticExecutableWithDynamicLibC" "-o launcher" "-Ob" + +FROM gcr.io/distroless/base-nossl + +COPY --from=native --chmod=777 /app/launcher /app/launcher + +CMD ["/app/launcher"] + + diff --git a/atomosfeaturelauncher/build.sh b/atomosfeaturelauncher/build.sh new file mode 100644 index ..8d1cc8fd --- /dev/null +++ b/atomosfeaturelauncher/build.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +source ./atomos_init.sh + +native-image --verbose \ +-cp "artifacts/org/apache/sling/org.apache.sling.feature.launcher.atomos/0.0.1-SNAPSHOT/org.apache.sling.feature.launcher.atomos-0.0.1-SNAPSHOT.jar:\ +artifacts/org/apache/sling/org.apache.sling.feature.launcher/1.2.4/org.apache.sling.feature.launcher-1.2.4.jar:\ +artifacts/org/apache/felix/org.apache.felix.atomos/1.0.1-SNAPSHOT/org.apache.felix.atomos-1.0.1-SNAPSHOT.jar:\ +artifacts/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25.jar:\ +artifacts/org/apache/sling/org.apache.sling.feature/1.3.0/org.apache.sling.feature-1.3.0.jar:\ +artifacts/org/apache/felix/org.apache.felix.cm.json/1.0.6/org.apache.felix.cm.json-1.0.6.jar:\ +artifacts/commons-cli/commons-cli/1.4/commons-cli-1.4.jar:\ +$ATOMOS_CLASSPATH" \ +org.apache.sling.feature.launcher.atomos.AtomosLaucherMain \ +--no-fallback --enable-https --enable-http \ +"$ATOMOS_INIT" \ +"-H:ResourceConfigurationFiles=resource-config.json" \ +"-H:ReflectionConfigurationFiles=reflect-config.json" \ +"-H:DynamicProxyConfigurationFiles=proxy-config.json" \ +"-H:JNIConfigurationFiles=jni-config.json" \ +"-H:SerializationConfigurationFiles=serialization-config.json" \ +"$@" + diff --git a/atomosfeaturelauncher/pom.xml b/atomosfeaturelauncher/pom.xml index 48bbdbfb..c6d6fa8f 100644 --- a/atomosfeaturelauncher/pom.xml +++ b/atomosfeaturelauncher/pom.xml @@ -34,12 +34,15 @@ Apache Sling Atomos feature launcher 0.0.1-SNAPSHOT + +11 + org.apache.sling slingfeature-maven-plugin -1.1.6 +1.6.4 true @@ -59,9 +62,105 @@ repository + + + +**/*.* + + +org.apache.sling + org.apache.sling.feature.launcher.atomos +0.0.1-SNAPSHOT +jar + + +org.apache.sling + org.apache.sling.feature.launcher +1.2.4 +jar + + +org.osgi +osgi.core +8.0.0 +
(sling-whiteboard) branch master updated (d4a1713e -> 4aebf335)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
from d4a1713e oidc-rp: fix OidcClientImplTest
new 389e459a Add docker support and some experimentation with a weaver
new d5f9537d Add a config launcher to create atomos config
new 4aebf335 Add a weaver that allows to weave references to get
classloader
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
atomosfeaturelauncher/Dockerfile | 21 +
atomosfeaturelauncher/build.sh | 23 +
atomosfeaturelauncher/pom.xml | 131 +++-
.../src/main/features/feature.json | 732 +
.../feature/launcher/atomos/AtomosLauncher.java| 62 +-
.../feature/launcher/atomos/AtomosRunner.java | 128 +++-
.../pom.xml| 52 +-
.../atomos/config/AtomosConfigLauncher.java| 180 +
.../launcher/atomos/config/AtomosConfigRunner.java | 356 ++
.../launcher/atomos/config/IndexPlugin.java| 327 +
.../org.apache.sling.feature.launcher.spi.Launcher | 1 +
.../pom.xml| 78 +--
.../launcher/atomos/weaver/AtomosWeaver.java | 14 +-
.../sling/feature/launcher/atomos/weaver/Test.java | 64 ++
.../atomos/weaver/impl/AtomosWeaverImpl.java | 19 +-
.../atomos/weaver/impl/AtomosWeaverVisitor.java| 115
.../atomos/weaver/impl/StaticToolClassWriter.java | 72 ++
.../feature/launcher/atomos/weaver/main/Main.java | 71 ++
...ing.feature.launcher.atomos.weaver.AtomosWeaver | 1 +
19 files changed, 2191 insertions(+), 256 deletions(-)
create mode 100644 atomosfeaturelauncher/Dockerfile
create mode 100644 atomosfeaturelauncher/build.sh
copy {atomosfeaturelauncher => atomosfeaturelauncherconfig}/pom.xml (77%)
create mode 100644
atomosfeaturelauncherconfig/src/main/java/org/apache/sling/feature/launcher/atomos/config/AtomosConfigLauncher.java
create mode 100644
atomosfeaturelauncherconfig/src/main/java/org/apache/sling/feature/launcher/atomos/config/AtomosConfigRunner.java
create mode 100644
atomosfeaturelauncherconfig/src/main/java/org/apache/sling/feature/launcher/atomos/config/IndexPlugin.java
create mode 100644
atomosfeaturelauncherconfig/src/main/resources/META-INF/services/org.apache.sling.feature.launcher.spi.Launcher
copy {atomosfeaturelauncher => atomosfeaturelauncherweaver}/pom.xml (50%)
copy
it-is-cloudy-here/org-apache-sling-remote-resourceprovider/src/main/java/org/apache/sling/remote/resourceprovider/RemoteResourceEvent.java
=>
atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/AtomosWeaver.java
(77%)
create mode 100644
atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/Test.java
copy
it-is-cloudy-here/org-apache-sling-remote-resourceprovider/src/main/java/org/apache/sling/remote/resourceprovider/impl/RemoteResourceProviderContext.java
=>
atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/impl/AtomosWeaverImpl.java
(66%)
create mode 100644
atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/impl/AtomosWeaverVisitor.java
create mode 100644
atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/impl/StaticToolClassWriter.java
create mode 100644
atomosfeaturelauncherweaver/src/main/java/org/apache/sling/feature/launcher/atomos/weaver/main/Main.java
create mode 100644
atomosfeaturelauncherweaver/src/main/resources/META-INF/services/org.apache.sling.feature.launcher.atomos.weaver.AtomosWeaver
(sling-whiteboard) 02/03: Add a config launcher to create atomos config
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-whiteboard.git commit d5f9537da8dcacd4ec7f11ef59c3d6b4b9628d02 Author: Karl Pauls AuthorDate: Fri Dec 1 10:14:35 2023 +0100 Add a config launcher to create atomos config --- atomosfeaturelauncherconfig/pom.xml| 112 +++ .../atomos/config/AtomosConfigLauncher.java| 180 +++ .../launcher/atomos/config/AtomosConfigRunner.java | 356 + .../launcher/atomos/config/IndexPlugin.java| 327 +++ .../org.apache.sling.feature.launcher.spi.Launcher | 1 + 5 files changed, 976 insertions(+) diff --git a/atomosfeaturelauncherconfig/pom.xml b/atomosfeaturelauncherconfig/pom.xml new file mode 100644 index ..7da4a115 --- /dev/null +++ b/atomosfeaturelauncherconfig/pom.xml @@ -0,0 +1,112 @@ + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + +4.0.0 + + +org.apache.sling +sling-bundle-parent +35 + + + +org.apache.sling.feature.launcher.atomos.config +Apache Sling Atomos feature launcher config + +0.0.1-SNAPSHOT + +11 + + + + +biz.aQute.bnd +bnd-baseline-maven-plugin + +false + + + +org.springframework.boot +spring-boot-maven-plugin +2.2.5.RELEASE + + org.apache.sling.feature.launcher.impl.Main +fatjar + + + + +repackage + + + + + +org.apache.rat +apache-rat-plugin + + +readme.md + src/main/resources/META-INF/services/** +**/*.properties +launcher/** +**/*.patch + + + + + + + +org.osgi +osgi.core +8.0.0 +provided + + +org.apache.felix +org.apache.felix.framework +7.0.5 +provided + + +org.apache.sling +org.apache.sling.feature.launcher +1.2.4 +provided + + +org.apache.felix +org.apache.felix.atomos +1.0.1-SNAPSHOT +provided + + +org.apache.felix.atomos.utils +org.apache.felix.atomos.utils.core +0.9.1-SNAPSHOT + + + + diff --git a/atomosfeaturelauncherconfig/src/main/java/org/apache/sling/feature/launcher/atomos/config/AtomosConfigLauncher.java b/atomosfeaturelauncherconfig/src/main/java/org/apache/sling/feature/launcher/atomos/config/AtomosConfigLauncher.java new file mode 100644 index ..ce45e95e --- /dev/null +++ b/atomosfeaturelauncherconfig/src/main/java/org/apache/sling/feature/launcher/atomos/config/AtomosConfigLauncher.java @@ -0,0 +1,180 @@ +/*~~ + ~ 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.launcher.atomos.config; + +import org.apache.felix.atomos.utils.api.plugin.SubstratePlugin; +import org.apache.felix.atomos.utils.core.LauncherBuilderImpl; +import org.apache.felix.atomos.utils.substrate.api.resource.ResourceConfiguration; +import org.apache.felix.atomos.utils.substrate.impl.config.DefaultResourceConfiguration; +import org.a
[sling-whiteboard] branch master updated: Add a first version of an atomos launcher
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-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new cbad8993 Add a first version of an atomos launcher
cbad8993 is described below
commit cbad8993f277a4fe6a22a07bc62ed8c5a0fb3508
Author: Karl Pauls
AuthorDate: Wed Oct 4 13:36:34 2023 +0200
Add a first version of an atomos launcher
---
atomosfeaturelauncher/.gitignore | 2 +
atomosfeaturelauncher/pom.xml | 130 ++
.../src/main/features/feature.json | 265 +
atomosfeaturelauncher/src/main/features/up.json| 5 +
.../launcher/atomos/AtomosArtifactProvider.java| 60 +
.../launcher/atomos/AtomosFrameworkFactory.java| 45
.../feature/launcher/atomos/AtomosLaucherMain.java | 48
.../feature/launcher/atomos/AtomosLauncher.java| 88 +++
.../feature/launcher/atomos/AtomosRunner.java | 150
...sling.feature.io.artifacts.spi.ArtifactProvider | 1 +
.../org.apache.sling.feature.launcher.spi.Launcher | 1 +
11 files changed, 795 insertions(+)
diff --git a/atomosfeaturelauncher/.gitignore b/atomosfeaturelauncher/.gitignore
new file mode 100644
index ..c9e18c8e
--- /dev/null
+++ b/atomosfeaturelauncher/.gitignore
@@ -0,0 +1,2 @@
+target
+launcher
diff --git a/atomosfeaturelauncher/pom.xml b/atomosfeaturelauncher/pom.xml
new file mode 100644
index ..48bbdbfb
--- /dev/null
+++ b/atomosfeaturelauncher/pom.xml
@@ -0,0 +1,130 @@
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+4.0.0
+
+
+org.apache.sling
+sling-bundle-parent
+35
+
+
+
+org.apache.sling.feature.launcher.atomos
+Apache Sling Atomos feature launcher
+
+0.0.1-SNAPSHOT
+
+
+
+org.apache.sling
+slingfeature-maven-plugin
+1.1.6
+true
+
+
+attach
+
+attach-features
+
+
+
+embed
+
+embed-features
+
+
+
+create-repository
+
+repository
+
+
+
+
+
+org.springframework.boot
+spring-boot-maven-plugin
+2.2.5.RELEASE
+
+
org.apache.sling.feature.launcher.atomos.AtomosLaucherMain
+fatjar
+
+
+
+
+repackage
+
+
+
+
+
+biz.aQute.bnd
+bnd-baseline-maven-plugin
+
+false
+
+
+
+org.apache.rat
+apache-rat-plugin
+
+
+readme.md
+
src/main/resources/META-INF/services/**
+**/*.properties
+launcher/**
+**/*.patch
+
+
+
+
+
+
+
+org.osgi
+osgi.core
+8.0.0
+provided
+
+
+org.apache.felix
+org.apache.felix.framework
+7.0.5
+provided
+
+
+org.apache.sling
+org.apache.sling.feature.launcher
+1.2.4
+provided
+
+
+org.apache.felix
+org.apache.felix.atomos
+1.0.1-SNAPSHOT
+provided
+
+
+
+
diff --git a/atomosfeaturelauncher/src/main/features/feature.json
b/atomosfeaturelauncher/src/main/features/feature.json
new file mode 100644
index ..411e2378
--- /dev/null
+++ b/atomosfeaturelauncher/src/main/features/feature.json
@@ -0,0 +1,265 @@
+{
+ "bundles":[
+{
+ "id":"commons-fileupload:commons-fileupload:1.5",
+ "start-order":"1"
+},
+{
+ "id":"commons-io:commons-io:2.11.0",
+ "start-order":"1"
+},
+{
+ "id":&q
[sling-org-apache-sling-feature] branch master updated: SLING-11630: Feature model IOUtils should not use caches for jar files from jar url connection
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-feature.git
The following commit(s) were added to refs/heads/master by this push:
new ee585cc SLING-11630: Feature model IOUtils should not use caches for
jar files from jar url connection
ee585cc is described below
commit ee585ccae7d4b70950098a3ad71764a2431b33da
Author: Karl Pauls
AuthorDate: Wed Oct 19 16:22:37 2022 +0200
SLING-11630: Feature model IOUtils should not use caches for jar files from
jar url connection
---
src/main/java/org/apache/sling/feature/io/IOUtils.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/feature/io/IOUtils.java
b/src/main/java/org/apache/sling/feature/io/IOUtils.java
index 9dd9f33..5ef9b36 100644
--- a/src/main/java/org/apache/sling/feature/io/IOUtils.java
+++ b/src/main/java/org/apache/sling/feature/io/IOUtils.java
@@ -236,7 +236,9 @@ public class IOUtils {
else if (!url.getPath().endsWith("!/")) {
targetURL = new URL(toURLString(url) + "!/");
}
-return ((JarURLConnection)
targetURL.openConnection()).getJarFile();
+JarURLConnection connection = (JarURLConnection)
targetURL.openConnection();
+connection.setUseCaches(false);
+return connection.getJarFile();
} catch (IOException ex) {
File file = getFileFromURL(url, cache, tmpDir);
if (file != null) {
[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-11373: use passthrough mode from SLING-11448 to allow mounting single providers (#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-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 9e66e95 SLING-11373: use passthrough mode from SLING-11448 to allow
mounting single providers (#30)
9e66e95 is described below
commit 9e66e95086ab85e7f9174ca902e1ef582e76d953
Author: Karl Pauls
AuthorDate: Thu Jul 14 12:01:49 2022 +0200
SLING-11373: use passthrough mode from SLING-11448 to allow mounting single
providers (#30)
---
pom.xml| 4 +-
.../servlets/resolver/internal/ResolverConfig.java | 9 ++-
.../resource/MergingServletResourceProvider.java | 29 ---
.../resolver/internal/resource/ServletMounter.java | 94 --
4 files changed, 95 insertions(+), 41 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9e93be5..9e09006 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,7 +209,7 @@
org.apache.sling
org.apache.sling.api
-2.25.0
+2.26.0-SNAPSHOT
provided
@@ -387,7 +387,7 @@
org.apache.sling
org.apache.sling.resourceresolver
-1.8.0
+1.10.0-SNAPSHOT
test
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/ResolverConfig.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/ResolverConfig.java
index 330f115..9cefe49 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/ResolverConfig.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/ResolverConfig.java
@@ -60,7 +60,12 @@ public @interface ResolverConfig {
String[] servletresolver_defaultExtensions() default "html"; // NOSONAR
@AttributeDefinition(name = "Mount Providers", description = "Should
servlets be mounted as resource providers?" +
-" If true (the default), servlets will be represented in the content
tree using resource provider -" +
-" otherwise, servlets will be decorated back into the content tree
using a decorator.")
+" If true (the default), servlets will be represented in the content
tree using resource providers -" +
+" otherwise, servlets will be decorated back into the content tree
using a decorator unless mount path providers is true.")
boolean servletresolver_mountProviders() default true; // NOSONAR
+
+@AttributeDefinition(name = "Mount Path Providers", description = "Should
servlets be mounted via a single resource provider per search path entry?" +
+" If false (the default), servlets will be represented in the
content tree using individual resource providers -" +
+" otherwise, servlets will be mounted into the content tree using
one resource provider per search path entry. This effectively overrides mount
providers.")
+boolean servletresolver_mountPathProviders() default false; // NOSONAR
}
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
index 8f2dcf9..c5925e1 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
@@ -18,6 +18,18 @@
*/
package org.apache.sling.servlets.resolver.internal.resource;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sling.api.resource.NonExistingResource;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.SyntheticResource;
+import org.apache.sling.spi.resource.provider.ResolveContext;
+import org.apache.sling.spi.resource.provider.ResourceContext;
+import org.apache.sling.spi.resource.provider.ResourceProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceReference;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -30,17 +42,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.sling.api.resource.NonExistingResource;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.SyntheticResource;
-import org.apache.sling.spi.resource.provider.ResolveContext;
-import org.apache.sling.spi.resource.provider.ResourceContext;
-import org.apache.sling.spi.resource.provider.Res
[sling-org-apache-sling-servlets-resolver] branch issues/SLING-11373-passthrough updated (653edcd -> 537cdf5)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issues/SLING-11373-passthrough in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git from 653edcd Update to latest sling api and resource resolver snapshot add 537cdf5 Update property everywhere No new revisions were added by this update. Summary of changes: .../sling/servlets/resolver/internal/resource/ServletMounter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[sling-org-apache-sling-servlets-resolver] branch issues/SLING-11373-passthrough updated: Update to latest sling api and resource resolver snapshot
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issues/SLING-11373-passthrough
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
The following commit(s) were added to refs/heads/issues/SLING-11373-passthrough
by this push:
new 653edcd Update to latest sling api and resource resolver snapshot
653edcd is described below
commit 653edcdf90a49ff7e1dabfdb7f57246ea27e41d4
Author: Karl Pauls
AuthorDate: Wed Jul 13 12:57:18 2022 +0200
Update to latest sling api and resource resolver snapshot
---
pom.xml | 4 ++--
.../sling/servlets/resolver/internal/resource/ServletMounter.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9e93be5..9e09006 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,7 +209,7 @@
org.apache.sling
org.apache.sling.api
-2.25.0
+2.26.0-SNAPSHOT
provided
@@ -387,7 +387,7 @@
org.apache.sling
org.apache.sling.resourceresolver
-1.8.0
+1.10.0-SNAPSHOT
test
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletMounter.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletMounter.java
index fbd452b..e2f0aab 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletMounter.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletMounter.java
@@ -114,7 +114,7 @@ public class ServletMounter {
final Dictionary params = new Hashtable<>();
params.put(ResourceProvider.PROPERTY_ROOT, path);
params.put(Constants.SERVICE_DESCRIPTION,
"ServletResourceProvider for Servlets");
-params.put("provider.mode", "passthrough");
+params.put(ResourceProvider.PROPERTY_MODE,
ResourceProvider.MODE_PASSTHROUGH);
providerRegs.add(context.registerService(ResourceProvider.class, provider,
params));
}
} else if (!config.servletresolver_mountProviders()) {
[sling-org-apache-sling-engine] branch master updated: SLING-11438 - Resource path consising of %7D with multiple dots leads… (#23)
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-engine.git
The following commit(s) were added to refs/heads/master by this push:
new 84cc2f1 SLING-11438 - Resource path consising of %7D with multiple
dots leads… (#23)
84cc2f1 is described below
commit 84cc2f15bb726b0daf66bebec2aa96b39fdea70d
Author: Sagar Miglani <85228812+sagarmigl...@users.noreply.github.com>
AuthorDate: Wed Jul 13 15:11:38 2022 +0530
SLING-11438 - Resource path consising of %7D with multiple dots leads… (#23)
---
.../sling/engine/impl/request/RequestData.java | 46 +++---
.../sling/engine/impl/request/RequestDataTest.java | 21 ++
2 files changed, 62 insertions(+), 5 deletions(-)
diff --git
a/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
b/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
index 56b91a1..1a6690c 100644
--- a/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
+++ b/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
@@ -25,9 +25,9 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLDecoder;
import java.util.ArrayList;
-import java.util.regex.Pattern;
+import java.util.HashSet;
+import java.util.Set;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
@@ -179,9 +179,13 @@ public class RequestData {
private int peakRecusionDepth;
/**
- * Prevent traversal using '/../' or '/..' even if '[' is used inbetween
+ * Prevent traversal using '/../' or '/..' even if '[' or '}' is used
in-between
*/
-private static final Pattern PREVENT_TRAVERSAL =
Pattern.compile(".*/\\[*\\.\\[*\\.[\\[,\\.]*/.*|.*/\\[*\\.\\[*\\.[\\[,\\.]*$");
+private static final Set SKIPPED_TRAVERSAL_CHARS = new
HashSet<>();
+static {
+SKIPPED_TRAVERSAL_CHARS.add('[');
+SKIPPED_TRAVERSAL_CHARS.add('}');
+}
public static void setMaxCallCounter(int maxCallCounter) {
RequestData.maxCallCounter = maxCallCounter;
@@ -604,7 +608,7 @@ public class RequestData {
return false;
}
}
-return resourcePath == null ||
!PREVENT_TRAVERSAL.matcher(resourcePath).matches();
+return resourcePath == null || !traversesParentPath(resourcePath);
}
// -- Content inclusion stacking
---
@@ -763,4 +767,36 @@ public class RequestData {
private static interface SlingHttpServletRequestFactory {
SlingHttpServletRequest createRequest(RequestData requestData,
HttpServletRequest request);
}
+
+/*
+* Traverses the path segment wise and checks
+* if there is any path with only dots (".")
+* skipping SKIPPED_TRAVERSAL_CHARS characters in segment.
+*/
+private static boolean traversesParentPath(String path) {
+int index = 0;
+while (index < path.length()) {
+int charCount = 0;
+int dotCount = 0;
+// count dots (".") and total chars in each path segment (between
two '/')
+while (index < path.length() && path.charAt(index) != '/') {
+char c = path.charAt(index);
+if (!SKIPPED_TRAVERSAL_CHARS.contains(c)) {
+if (c == '.') {
+dotCount++;
+}
+charCount++;
+}
+index++;
+}
+// if all chars are dots (".")
+// path is traversing the parent directory
+if (charCount > 1 && dotCount == charCount) {
+return true;
+}
+index++;
+}
+return false;
+}
+
}
diff --git
a/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
b/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
index c3a6ce5..9e15c85 100644
--- a/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
@@ -178,6 +178,27 @@ public class RequestDataTest {
assertValidRequest(false, "/a/[..");
}
+@Test
+public void testDotsAnd7D() {
+assertValidRequest(false, "/a/..}}./b");
+assertValidRequest(false, "/a/}../b");
+assertValidRequest(false, "/a/..}..}./b");
+assertValidRequest(false, "/a/}..");
+assertValidRequest(false, "/a/..}");
+assertValidRequest(true, "
[sling-org-apache-sling-servlets-resolver] branch issues/SLING-11373-passthrough created (now 9b38313)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issues/SLING-11373-passthrough in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git at 9b38313 SLING-11373: use passthrough to mount the providers This branch includes the following new commits: new 9b38313 SLING-11373: use passthrough to mount the providers The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-org-apache-sling-servlets-resolver] 01/01: SLING-11373: use passthrough to mount the providers
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issues/SLING-11373-passthrough
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit 9b3831301ad759faad3e97a22d210fbc7809c680
Author: Karl Pauls
AuthorDate: Wed Jun 15 09:45:38 2022 +0200
SLING-11373: use passthrough to mount the providers
---
.../servlets/resolver/internal/ResolverConfig.java | 9 ++-
.../resource/MergingServletResourceProvider.java | 29 ---
.../resolver/internal/resource/ServletMounter.java | 94 --
3 files changed, 93 insertions(+), 39 deletions(-)
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/ResolverConfig.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/ResolverConfig.java
index 330f115..9cefe49 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/ResolverConfig.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/ResolverConfig.java
@@ -60,7 +60,12 @@ public @interface ResolverConfig {
String[] servletresolver_defaultExtensions() default "html"; // NOSONAR
@AttributeDefinition(name = "Mount Providers", description = "Should
servlets be mounted as resource providers?" +
-" If true (the default), servlets will be represented in the content
tree using resource provider -" +
-" otherwise, servlets will be decorated back into the content tree
using a decorator.")
+" If true (the default), servlets will be represented in the content
tree using resource providers -" +
+" otherwise, servlets will be decorated back into the content tree
using a decorator unless mount path providers is true.")
boolean servletresolver_mountProviders() default true; // NOSONAR
+
+@AttributeDefinition(name = "Mount Path Providers", description = "Should
servlets be mounted via a single resource provider per search path entry?" +
+" If false (the default), servlets will be represented in the
content tree using individual resource providers -" +
+" otherwise, servlets will be mounted into the content tree using
one resource provider per search path entry. This effectively overrides mount
providers.")
+boolean servletresolver_mountPathProviders() default false; // NOSONAR
}
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
index 8f2dcf9..c5925e1 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
@@ -18,6 +18,18 @@
*/
package org.apache.sling.servlets.resolver.internal.resource;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sling.api.resource.NonExistingResource;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.SyntheticResource;
+import org.apache.sling.spi.resource.provider.ResolveContext;
+import org.apache.sling.spi.resource.provider.ResourceContext;
+import org.apache.sling.spi.resource.provider.ResourceProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceReference;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -30,17 +42,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.sling.api.resource.NonExistingResource;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.SyntheticResource;
-import org.apache.sling.spi.resource.provider.ResolveContext;
-import org.apache.sling.spi.resource.provider.ResourceContext;
-import org.apache.sling.spi.resource.provider.ResourceProvider;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-
-public class MergingServletResourceProvider {
+public class MergingServletResourceProvider extends ResourceProvider {
private final List>>
registrations = new ArrayList<>();
private final AtomicReference>> tree
= new AtomicReference<>(new ConcurrentHashMap<>());
@@ -126,6 +128,11 @@ public class MergingServletResourceProvider {
}
}
+@Override
+public @Nullable Resource getResource(@NotNull ResolveContext
resolveContext, @NotNull String s, @NotNull ResourceContext resourceContext,
@Nullable Resource resource) {
+return getResource(resolveContext, s);
+}
+
@SuppressWarnings("unchecked
[sling-org-apache-sling-scripting-bundle-tracker-it] branch test/rr updated: Update to latest
This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch test/rr in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git The following commit(s) were added to refs/heads/test/rr by this push: new 0d99e9a Update to latest 0d99e9a is described below commit 0d99e9a8c2ce7e96a50c202dbf1f0f805d467963 Author: Karl Pauls AuthorDate: Wed Jun 15 09:47:55 2022 +0200 Update to latest --- it/pom.xml | 2 +- it/src/test/provisioning/sling.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/it/pom.xml b/it/pom.xml index df90791..01527c4 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -188,7 +188,7 @@ org.apache.sling org.apache.sling.servlets.resolver -2.9.6 +2.9.7-SNAPSHOT test diff --git a/it/src/test/provisioning/sling.txt b/it/src/test/provisioning/sling.txt index 06a2857..e81bd94 100644 --- a/it/src/test/provisioning/sling.txt +++ b/it/src/test/provisioning/sling.txt @@ -228,3 +228,5 @@ "org.apache.sling.installer.factory.packages\=sling-package-install" ] + org.apache.sling.servlets.resolver.SlingServletResolver +servletresolver.mountPathProviders=B"true"
[sling-org-apache-sling-scripting-bundle-tracker-it] 01/01: Test
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch test/rr
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
commit d00ce07cfb1ee8a12cb665cfca1826c30fe9be7a
Author: Karl Pauls
AuthorDate: Tue Jun 14 18:17:01 2022 +0200
Test
---
it/pom.xml| 4 ++--
it/src/test/provisioning/it-model.txt | 2 --
it/src/test/provisioning/repoinit.txt | 7 +++
it/src/test/provisioning/sling.txt| 14 ++
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/it/pom.xml b/it/pom.xml
index c869f9f..df90791 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -188,7 +188,7 @@
org.apache.sling
org.apache.sling.servlets.resolver
-2.9.3-SNAPSHOT
+2.9.6
test
@@ -206,7 +206,7 @@
org.apache.sling
org.apache.sling.scripting.sightly
-1.4.14-1.4.0
+1.4.18-1.4.0
test
diff --git a/it/src/test/provisioning/it-model.txt
b/it/src/test/provisioning/it-model.txt
index b5b8288..cfa07c5 100644
--- a/it/src/test/provisioning/it-model.txt
+++ b/it/src/test/provisioning/it-model.txt
@@ -48,5 +48,3 @@
org.apache.sling.engine.impl.SlingMainServlet
sling.trace.allow=B"true"
- org.apache.sling.servlets.resolver.SlingServletResolver
-servletresolver.mountProviders=B"false"
diff --git a/it/src/test/provisioning/repoinit.txt
b/it/src/test/provisioning/repoinit.txt
index b268d80..294a796 100644
--- a/it/src/test/provisioning/repoinit.txt
+++ b/it/src/test/provisioning/repoinit.txt
@@ -30,6 +30,13 @@
allow jcr:read on /content
end
+# SLING-9735 - Define service user and ACLs for jcr.contentloader >>>
+#<<< SLING-9809 - Define service user and ACLs for jcr.usermanager
+create service user sling-jcr-usermanager
+set ACL for sling-jcr-usermanager
+allow
jcr:read,jcr:readAccessControl,jcr:modifyAccessControl,rep:write,rep:userManagement
on /home
+end
+
# sling-mapping
create service user sling-mapping
diff --git a/it/src/test/provisioning/sling.txt
b/it/src/test/provisioning/sling.txt
index 5e0..06a2857 100644
--- a/it/src/test/provisioning/sling.txt
+++ b/it/src/test/provisioning/sling.txt
@@ -46,7 +46,7 @@
commons-io/commons-io/2.6
commons-fileupload/commons-fileupload/1.4
org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
-org.apache.sling/org.apache.sling.api/2.24.0
+org.apache.sling/org.apache.sling.api/2.25.0
org.apache.sling/org.apache.sling.auth.core/1.4.6
[artifacts startLevel=10]
@@ -70,7 +70,7 @@
org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
org.apache.sling/org.apache.sling.jcr.webdav/2.3.8
org.apache.sling/org.apache.sling.jcr.davex/1.3.10
-org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.16
+org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.22
org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/3.0.4
org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
io.dropwizard.metrics/metrics-core/3.2.6
@@ -98,7 +98,7 @@
org.apache.sling/org.apache.sling.commons.mime/2.2.2
org.apache.sling/org.apache.sling.commons.scheduler/2.7.6
org.apache.sling/org.apache.sling.commons.threads/3.2.20
-org.apache.sling/org.apache.sling.engine/2.8.0
+org.apache.sling/org.apache.sling.engine/2.9.0
org.apache.sling/org.apache.sling.fsresource/2.1.16
org.apache.sling/org.apache.sling.i18n/2.5.14
org.apache.sling/org.apache.sling.installer.console/1.1.0
@@ -110,7 +110,7 @@
org.apache.sling/org.apache.sling.jcr.resource/3.1.0
org.apache.sling/org.apache.sling.models.api/1.3.8
org.apache.sling/org.apache.sling.models.impl/1.4.12
-org.apache.sling/org.apache.sling.resourceresolver/1.8.0
+org.apache.sling/org.apache.sling.resourceresolver/1.9.1-SNAPSHOT
org.apache.sling/org.apache.sling.serviceusermapper/1.4.4
org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.2
org.apache.sling/org.apache.sling.servlets.get/2.1.40
@@ -217,6 +217,12 @@
"org.apache.sling.jcr.resource:validation\=sling-readall"
]
+
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr-usermanager
+ user.mapping=[
+
"org.apache.sling.jcr.jackrabbit.usermanager\=sling-jcr-usermanager"
+]
+
+
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer-factories
user.mapping=[
"org.apache.sling.installer.factory.packages\=sling-package-install"
[sling-org-apache-sling-scripting-bundle-tracker-it] branch test/rr created (now d00ce07)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch test/rr in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git at d00ce07 Test This branch includes the following new commits: new d00ce07 Test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-org-apache-sling-servlets-resolver] 01/01: SLING-11373: wrap resources returned from decorator to have them appear in the tree correctly
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issues/SLING-11373
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit d654ea7dc59d82eb6b5e70e00c15eb4c122b10fe
Author: Karl Pauls
AuthorDate: Fri Jun 10 14:46:19 2022 +0200
SLING-11373: wrap resources returned from decorator to have them appear in
the tree correctly
---
.../resolver/internal/ScriptResourceDecorator.java | 4 +-
.../resolver/internal/ScriptResourceResolver.java | 249 +++--
2 files changed, 238 insertions(+), 15 deletions(-)
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceDecorator.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceDecorator.java
index c8880d1..a80bcc6 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceDecorator.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceDecorator.java
@@ -61,7 +61,7 @@ public class ScriptResourceDecorator implements
ResourceDecorator {
script.getResourceMetadata().setResolutionPath(resolutionPath);
}
-return script;
+return ScriptResourceResolver.wrap(resource.getResourceResolver(),
() -> this.provider).wrap(script);
}
else {
return resource;
@@ -77,7 +77,7 @@ public class ScriptResourceDecorator implements
ResourceDecorator {
return provider.getResource(new ResolveContext() {
@Override
public ResourceResolver getResourceResolver() {
-return new
ScriptResourceResolver(resource.getResourceResolver(), () -> provider);
+return
ScriptResourceResolver.wrap(resource.getResourceResolver(), () -> provider);
}
@Override
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceResolver.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceResolver.java
index 5ac8eb0..a4bea2a 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceResolver.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceResolver.java
@@ -23,23 +23,24 @@ import java.util.Map;
import java.util.function.Supplier;
import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceWrapper;
+import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.IteratorWrapper;
-import org.apache.sling.api.wrappers.ResourceResolverWrapper;
import
org.apache.sling.servlets.resolver.internal.resource.MergingServletResourceProvider;
import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
-import org.jetbrains.annotations.NotNull;
-public class ScriptResourceResolver extends ResourceResolverWrapper {
+import javax.servlet.http.HttpServletRequest;
+
+public class ScriptResourceResolver implements ResourceResolver {
private final ResourceResolver resolver;
private final Supplier providerSupplier;
public ScriptResourceResolver(ResourceResolver resolver,
Supplier provider) {
-super(resolver);
this.resolver = resolver;
this.providerSupplier = provider;
}
@@ -58,7 +59,7 @@ public class ScriptResourceResolver extends
ResourceResolverWrapper {
MergingServletResourceProvider provider = this.providerSupplier.get();
if (provider == null) {
-return super.getResource(scriptPath);
+return resolver.getResource(scriptPath);
}
else {
return wrap(provider.getResource(new ResolveContext() {
@@ -96,7 +97,7 @@ public class ScriptResourceResolver extends
ResourceResolverWrapper {
}
@Override
-public Resource getResource(Resource base, @NotNull String path) {
+public Resource getResource(Resource base, String path) {
if (!path.startsWith("/") && base != null) {
path = String.format("%s/%s", base.getPath(), path);
}
@@ -107,7 +108,7 @@ public class ScriptResourceResolver extends
ResourceResolverWrapper {
public Iterator listChildren(Resource parent) {
MergingServletResourceProvider provider = this.providerSupplier.get();
if (provider == null) {
-return super.listChildren(parent);
+return resolver.listChildren(parent);
}
else {
return wrap(provider.listChildren(new ResolveContext() {
@@ -142,8 +143,160 @@ public
[sling-org-apache-sling-servlets-resolver] branch issues/SLING-11373 created (now d654ea7)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issues/SLING-11373 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git at d654ea7 SLING-11373: wrap resources returned from decorator to have them appear in the tree correctly This branch includes the following new commits: new d654ea7 SLING-11373: wrap resources returned from decorator to have them appear in the tree correctly The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
svn commit: r53089 - /release/sling/
Author: pauls Date: Mon Mar 14 22:57:08 2022 New Revision: 53089 Log: Add the Apache Sling Content-Package to Feature Model Converter 1.1.12 release Added: release/sling/org.apache.sling.feature.cpconverter-1.1.12-javadoc.jar (with props) release/sling/org.apache.sling.feature.cpconverter-1.1.12-javadoc.jar.asc release/sling/org.apache.sling.feature.cpconverter-1.1.12-javadoc.jar.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.12-source-release.zip (with props) release/sling/org.apache.sling.feature.cpconverter-1.1.12-source-release.zip.asc release/sling/org.apache.sling.feature.cpconverter-1.1.12-source-release.zip.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.12-source-release.zip.sha512 release/sling/org.apache.sling.feature.cpconverter-1.1.12-source-release.zip.sha512.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.12-sources.jar (with props) release/sling/org.apache.sling.feature.cpconverter-1.1.12-sources.jar.asc release/sling/org.apache.sling.feature.cpconverter-1.1.12-sources.jar.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.12.jar (with props) release/sling/org.apache.sling.feature.cpconverter-1.1.12.jar.asc release/sling/org.apache.sling.feature.cpconverter-1.1.12.jar.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.12.pom release/sling/org.apache.sling.feature.cpconverter-1.1.12.pom.asc release/sling/org.apache.sling.feature.cpconverter-1.1.12.pom.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.12.tar.gz (with props) release/sling/org.apache.sling.feature.cpconverter-1.1.12.tar.gz.asc release/sling/org.apache.sling.feature.cpconverter-1.1.12.tar.gz.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.12.zip (with props) release/sling/org.apache.sling.feature.cpconverter-1.1.12.zip.asc release/sling/org.apache.sling.feature.cpconverter-1.1.12.zip.sha1 Removed: release/sling/org.apache.sling.feature.cpconverter-1.1.10-javadoc.jar release/sling/org.apache.sling.feature.cpconverter-1.1.10-javadoc.jar.asc release/sling/org.apache.sling.feature.cpconverter-1.1.10-javadoc.jar.md5 release/sling/org.apache.sling.feature.cpconverter-1.1.10-javadoc.jar.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.10-source-release.zip release/sling/org.apache.sling.feature.cpconverter-1.1.10-source-release.zip.asc release/sling/org.apache.sling.feature.cpconverter-1.1.10-source-release.zip.md5 release/sling/org.apache.sling.feature.cpconverter-1.1.10-source-release.zip.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.10-source-release.zip.sha512 release/sling/org.apache.sling.feature.cpconverter-1.1.10-source-release.zip.sha512.md5 release/sling/org.apache.sling.feature.cpconverter-1.1.10-source-release.zip.sha512.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.10-sources.jar release/sling/org.apache.sling.feature.cpconverter-1.1.10-sources.jar.asc release/sling/org.apache.sling.feature.cpconverter-1.1.10-sources.jar.md5 release/sling/org.apache.sling.feature.cpconverter-1.1.10-sources.jar.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.10.jar release/sling/org.apache.sling.feature.cpconverter-1.1.10.jar.asc release/sling/org.apache.sling.feature.cpconverter-1.1.10.jar.md5 release/sling/org.apache.sling.feature.cpconverter-1.1.10.jar.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.10.pom release/sling/org.apache.sling.feature.cpconverter-1.1.10.pom.asc release/sling/org.apache.sling.feature.cpconverter-1.1.10.pom.md5 release/sling/org.apache.sling.feature.cpconverter-1.1.10.pom.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.10.tar.gz release/sling/org.apache.sling.feature.cpconverter-1.1.10.tar.gz.asc release/sling/org.apache.sling.feature.cpconverter-1.1.10.tar.gz.md5 release/sling/org.apache.sling.feature.cpconverter-1.1.10.tar.gz.sha1 release/sling/org.apache.sling.feature.cpconverter-1.1.10.zip release/sling/org.apache.sling.feature.cpconverter-1.1.10.zip.asc release/sling/org.apache.sling.feature.cpconverter-1.1.10.zip.md5 release/sling/org.apache.sling.feature.cpconverter-1.1.10.zip.sha1 Added: release/sling/org.apache.sling.feature.cpconverter-1.1.12-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.feature.cpconverter-1.1.12-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.feature.cpconverter-1.1.12-javadoc.jar.asc == --- release/sling/org.apache.sling.feature.cpconverter-1.1.12-javadoc.jar.asc (added
[sling-org-apache-sling-scripting-bundle-tracker-it] branch master updated: SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only (#5)
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-scripting-bundle-tracker-it.git The following commit(s) were added to refs/heads/master by this push: new 88656cb SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only (#5) 88656cb is described below commit 88656cbe05116848ec1ca7c7efcd1f68b0898dca Author: Karl Pauls AuthorDate: Fri Mar 11 15:13:18 2022 +0100 SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only (#5) --- .../src/main/scripts/apps/rt2/extends | 1 + .../pom.xml| 53 -- .../main/resources/javax.script/libs/rt/rt.html| 19 it/pom.xml | 6 +++ .../it/ExampleBundlePrecompiledTeleportedIT.java | 15 ++ it/src/test/provisioning/it-model.txt | 1 + pom.xml| 1 + 7 files changed, 73 insertions(+), 23 deletions(-) diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rt2/extends b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rt2/extends new file mode 100644 index 000..6ec52fa --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rt2/extends @@ -0,0 +1 @@ +rt \ No newline at end of file diff --git a/pom.xml b/examples/org-apache-sling-scripting-examplebundle-static/pom.xml similarity index 55% copy from pom.xml copy to examples/org-apache-sling-scripting-examplebundle-static/pom.xml index 07de5d8..549f556 100644 --- a/pom.xml +++ b/examples/org-apache-sling-scripting-examplebundle-static/pom.xml @@ -20,44 +20,51 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + org.apache.sling -sling -34 +sling-bundle-parent +41 4.0.0 - org.apache.sling.scripting.bundle.tracker.it.reactor +org.apache.sling.scripting.examplebundle.static 0.1.1-SNAPSHOT -pom - - -examples/org-apache-sling-scripting-examplebundle - examples/org-apache-sling-scripting-examplebundle-classic - examples/org-apache-sling-scripting-examplebundle-extend1 - examples/org-apache-sling-scripting-examplebundle-extend2 - examples/org-apache-sling-scripting-examplebundle-precompiled - examples/org-apache-sling-scripting-examplebundle-precompiled-extend1 - examples/org-apache-sling-scripting-examplebundle-precompiled-jsp - examples/org-apache-sling-scripting-content-package-with-bundle-attached -it - -org.apache.rat -apache-rat-plugin +org.apache.maven.plugins +maven-deploy-plugin - -**/*.md -*/target/** -**/*.iml - +true + +biz.aQute.bnd +bnd-baseline-maven-plugin + +true + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + +sling.servlet;sling.servlet.resourceTypes:List<String>="/libs/rt,rt";scriptEngine=htl;scriptExtension=html +osgi.extender;filter:="(&(osgi.extender=sling.scripting)(version>=1.0.0)(!(version>=2.0.0)))" + + + + + + + diff --git a/examples/org-apache-sling-scripting-examplebundle-static/src/main/resources/javax.script/libs/rt/rt.html b/examples/org-apache-sling-scripting-examplebundle-static/src/main/resources/javax.script/libs/rt/rt.html new file mode 100644 index 000..de3f066 --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle-static/src/main/resources/javax.script/libs/rt/rt.html @@ -0,0 +1,19 @@ + +/libs/rt \ No newline at end of file diff --git a/it/pom.xml b/it/pom.xml index 5221057..c869f9f 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -271,6 +271,12 @@ org.apache.sling + org.apache.sling.scripting.examplebundle.static +0.1.1-SNAPSHOT +test + + +org.apache.sling org.apache.sling.scripting.examplebundle.precompiled.jsp 0.1.1-SNAPSHOT test diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBu
[sling-org-apache-sling-scripting-bundle-tracker-it] branch SLING-11155_2 updated (3dc794e -> d1b0dc6)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch SLING-11155_2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git. from 3dc794e SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only add d1b0dc6 Address comments No new revisions were added by this update. Summary of changes: .../tracker/it/ExampleBundlePrecompiledTeleportedIT.java | 15 +++ .../bundle/tracker/it/ExampleBundleTeleportedIT.java | 15 --- 2 files changed, 15 insertions(+), 15 deletions(-)
[sling-org-apache-sling-scripting-bundle-tracker-it] branch SLING-11155_2 updated: SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only
This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch SLING-11155_2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git The following commit(s) were added to refs/heads/SLING-11155_2 by this push: new 3dc794e SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only 3dc794e is described below commit 3dc794e8f2586e21de96ed3f0c52c48ce7e9b9d9 Author: Karl Pauls AuthorDate: Fri Mar 11 14:39:13 2022 +0100 SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only --- .../src/main/scripts/libs/rt/rt.html | 19 --- 1 file changed, 19 deletions(-) diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rt/rt.html b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rt/rt.html deleted file mode 100644 index de3f066..000 --- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rt/rt.html +++ /dev/null @@ -1,19 +0,0 @@ - -/libs/rt \ No newline at end of file
[sling-org-apache-sling-scripting-bundle-tracker-it] branch SLING-11155_2 created (now ce56044)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch SLING-11155_2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git. at ce56044 SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only This branch includes the following new commits: new ce56044 SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-org-apache-sling-scripting-bundle-tracker-it] 01/01: SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only
This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch SLING-11155_2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git commit ce56044d796e6bd582e29075f68638be1b7209e8 Author: Karl Pauls AuthorDate: Fri Mar 11 14:38:01 2022 +0100 SLING-11155: add a test to make sure we bind proxy resource type registrations by full path only --- .../src/main/scripts/libs/rt/rt.html | 19 .../src/main/scripts/apps/rt2/extends | 1 + .../pom.xml| 53 -- .../main/resources/javax.script/libs/rt/rt.html| 19 it/pom.xml | 6 +++ .../tracker/it/ExampleBundleTeleportedIT.java | 15 ++ it/src/test/provisioning/it-model.txt | 1 + pom.xml| 1 + 8 files changed, 92 insertions(+), 23 deletions(-) diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rt/rt.html b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rt/rt.html new file mode 100644 index 000..de3f066 --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rt/rt.html @@ -0,0 +1,19 @@ + +/libs/rt \ No newline at end of file diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rt2/extends b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rt2/extends new file mode 100644 index 000..6ec52fa --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rt2/extends @@ -0,0 +1 @@ +rt \ No newline at end of file diff --git a/pom.xml b/examples/org-apache-sling-scripting-examplebundle-static/pom.xml similarity index 55% copy from pom.xml copy to examples/org-apache-sling-scripting-examplebundle-static/pom.xml index 07de5d8..549f556 100644 --- a/pom.xml +++ b/examples/org-apache-sling-scripting-examplebundle-static/pom.xml @@ -20,44 +20,51 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + org.apache.sling -sling -34 +sling-bundle-parent +41 4.0.0 - org.apache.sling.scripting.bundle.tracker.it.reactor +org.apache.sling.scripting.examplebundle.static 0.1.1-SNAPSHOT -pom - - -examples/org-apache-sling-scripting-examplebundle - examples/org-apache-sling-scripting-examplebundle-classic - examples/org-apache-sling-scripting-examplebundle-extend1 - examples/org-apache-sling-scripting-examplebundle-extend2 - examples/org-apache-sling-scripting-examplebundle-precompiled - examples/org-apache-sling-scripting-examplebundle-precompiled-extend1 - examples/org-apache-sling-scripting-examplebundle-precompiled-jsp - examples/org-apache-sling-scripting-content-package-with-bundle-attached -it - -org.apache.rat -apache-rat-plugin +org.apache.maven.plugins +maven-deploy-plugin - -**/*.md -*/target/** -**/*.iml - +true + +biz.aQute.bnd +bnd-baseline-maven-plugin + +true + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + +sling.servlet;sling.servlet.resourceTypes:List<String>="/libs/rt,rt";scriptEngine=htl;scriptExtension=html +osgi.extender;filter:="(&(osgi.extender=sling.scripting)(version>=1.0.0)(!(version>=2.0.0)))" + + + + + + + diff --git a/examples/org-apache-sling-scripting-examplebundle-static/src/main/resources/javax.script/libs/rt/rt.html b/examples/org-apache-sling-scripting-examplebundle-static/src/main/resources/javax.script/libs/rt/rt.html new file mode 100644 index 000..de3f066 --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle-static/src/main/resources/javax.script/libs/rt/rt.html @@ -0,0 +1,19 @@ + +/libs/rt \ No newline at end of file diff --git a/it/pom.xml b/it/pom.xml index 5221057..c869f9f 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -271,6 +271,12 @@ org.apache.sling + org.apache.sling.scripting.ex
[sling-org-apache-sling-feature-cpconverter] 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-feature-cpconverter.git The following commit(s) were added to refs/heads/master by this push: new 197d62a [maven-release-plugin] prepare for next development iteration 197d62a is described below commit 197d62a2f353d0aa0f75cca711e4189489f69951 Author: Karl Pauls AuthorDate: Thu Mar 10 22:22:05 2022 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0658ec..945207d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.sling.feature.cpconverter - 1.1.12 + 1.1.13-SNAPSHOT Apache Sling Content-Package to Feature Model Converter Content Package to Feature Model converter tools for Apache Sling
[sling-org-apache-sling-feature-cpconverter] annotated tag org.apache.sling.feature.cpconverter-1.1.12 created (now f38a48e)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag org.apache.sling.feature.cpconverter-1.1.12 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git. at f38a48e (tag) tagging 3e4ec5d430bef06e4cd0dc9d1fcd223a67fd5cec (commit) replaces org.apache.sling.feature.cpconverter-1.1.10 by Karl Pauls on Thu Mar 10 22:22:01 2022 +0100 - Log - [maven-release-plugin] copy for tag org.apache.sling.feature.cpconverter-1.1.12 --- No new revisions were added by this update.
[sling-org-apache-sling-feature-cpconverter] branch master updated: [maven-release-plugin] prepare release org.apache.sling.feature.cpconverter-1.1.12
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-feature-cpconverter.git The following commit(s) were added to refs/heads/master by this push: new 3e4ec5d [maven-release-plugin] prepare release org.apache.sling.feature.cpconverter-1.1.12 3e4ec5d is described below commit 3e4ec5d430bef06e4cd0dc9d1fcd223a67fd5cec Author: Karl Pauls AuthorDate: Thu Mar 10 22:21:56 2022 +0100 [maven-release-plugin] prepare release org.apache.sling.feature.cpconverter-1.1.12 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9f69734..a0658ec 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.sling.feature.cpconverter - 1.1.11-SNAPSHOT + 1.1.12 Apache Sling Content-Package to Feature Model Converter Content Package to Feature Model converter tools for Apache Sling @@ -48,7 +48,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-feature-cpconverter.git -HEAD +org.apache.sling.feature.cpconverter-1.1.12
[sling-org-apache-sling-feature] branch nocache created (now b38c594)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch nocache in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git. at b38c594 Set use caches to false in IOUtils get jar to work around a possible jvm issue This branch includes the following new commits: new b38c594 Set use caches to false in IOUtils get jar to work around a possible jvm issue The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-org-apache-sling-feature] 01/01: Set use caches to false in IOUtils get jar to work around a possible jvm issue
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch nocache
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git
commit b38c5949a82e19c7c39cd1a6437197c2e68d53a0
Author: Karl Pauls
AuthorDate: Wed Mar 2 00:08:36 2022 +0100
Set use caches to false in IOUtils get jar to work around a possible jvm
issue
---
src/main/java/org/apache/sling/feature/io/IOUtils.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/feature/io/IOUtils.java
b/src/main/java/org/apache/sling/feature/io/IOUtils.java
index 9dd9f33..5ef9b36 100644
--- a/src/main/java/org/apache/sling/feature/io/IOUtils.java
+++ b/src/main/java/org/apache/sling/feature/io/IOUtils.java
@@ -236,7 +236,9 @@ public class IOUtils {
else if (!url.getPath().endsWith("!/")) {
targetURL = new URL(toURLString(url) + "!/");
}
-return ((JarURLConnection)
targetURL.openConnection()).getJarFile();
+JarURLConnection connection = (JarURLConnection)
targetURL.openConnection();
+connection.setUseCaches(false);
+return connection.getJarFile();
} catch (IOException ex) {
File file = getFileFromURL(url, cache, tmpDir);
if (file != null) {
[sling-org-apache-sling-feature-launcher] branch master updated: SLING-11166: add a runWithException method to the bootstrap
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-feature-launcher.git
The following commit(s) were added to refs/heads/master by this push:
new 7cea27f SLING-11166: add a runWithException method to the bootstrap
7cea27f is described below
commit 7cea27fc911d05cfd64925017d234ab7cba9fade
Author: Karl Pauls
AuthorDate: Mon Feb 28 16:45:06 2022 +0100
SLING-11166: add a runWithException method to the bootstrap
---
.../sling/feature/launcher/impl/Bootstrap.java | 31 ++
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java
b/src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java
index dde1b04..8e9201b 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java
@@ -96,6 +96,15 @@ public class Bootstrap {
}
public void run() {
+try {
+runWithException();
+} catch (Exception ex) {
+this.logger.error("Error during bootstrap", ex);
+System.exit(1);
+}
+}
+
+public void runWithException() throws Exception {
this.logger.info("");
this.logger.info("Apache Sling Application Launcher");
this.logger.info("-");
@@ -106,8 +115,7 @@ public class Bootstrap {
Iterator iterator =
ServiceLoader.load(Launcher.class).iterator();
if (!iterator.hasNext()) {
-this.logger.error("Unable to find launcher service.");
-System.exit(1);
+throw new IllegalStateException("Unable to find launcher
service.");
}
final Launcher launcher = iterator.next();
@@ -158,21 +166,14 @@ public class Bootstrap {
this.config.getInstallation().getBundleMap().clear();
}
} catch ( final Exception iae) {
-this.logger.error("Error while assembling launcher: {}",
iae.getMessage(), iae);
-System.exit(1);
+throw new IllegalStateException("Error while assembling
launcher: " + iae.getMessage(), iae);
}
}
catch (IOException ex) {
-this.logger.error("Unable to setup artifact manager: {}",
ex.getMessage(), ex);
-System.exit(1);
+throw new IOException("Unable to setup artifact manager: " +
ex.getMessage(), ex);
}
-try {
-run(launcher);
-} catch ( final Exception iae) {
-this.logger.error("Error while running launcher: {}",
iae.getMessage(), iae);
-System.exit(1);
-}
+run(launcher);
}
private ArtifactId getFrameworkArtifactId(final Feature app) {
@@ -217,11 +218,7 @@ public class Bootstrap {
{
FeatureJSONWriter.write(writer, app);
}
-catch (final IOException ioe)
-{
-this.logger.error("Error while writing application file: {}",
ioe.getMessage(), ioe);
-System.exit(1);
-}
+
return app;
}
}
[sling-org-apache-sling-feature-extension-apiregions] branch master updated: SLING-11164: keep feature to region cache on feature merge (#18)
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-feature-extension-apiregions.git
The following commit(s) were added to refs/heads/master by this push:
new bd9023c SLING-11164: keep feature to region cache on feature merge
(#18)
bd9023c is described below
commit bd9023c83d710700eadb9c43b8d6a2af775aedb4
Author: Karl Pauls
AuthorDate: Mon Feb 28 13:09:26 2022 +0100
SLING-11164: keep feature to region cache on feature merge (#18)
---
.../apiregions/ConfigurationApiMergeHandler.java | 1 +
.../ConfigurationApiMergeHandlerTest.java | 41 ++
2 files changed, 42 insertions(+)
diff --git
a/src/main/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandler.java
b/src/main/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandler.java
index 082ee61..45bf7a6 100644
---
a/src/main/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandler.java
+++
b/src/main/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandler.java
@@ -101,6 +101,7 @@ public class ConfigurationApiMergeHandler implements
MergeHandler {
// update cache
if ( !context.isPrototypeMerge() ) {
targetApi.getFeatureToRegionCache().put(sourceFeature.getId(),
sourceApi.detectRegion());
+
targetApi.getFeatureToRegionCache().putAll(sourceApi.getFeatureToRegionCache());
}
ConfigurationApi.setConfigurationApi(targetFeature, targetApi);
diff --git
a/src/test/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandlerTest.java
b/src/test/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandlerTest.java
index f2fdb94..3231fbe 100644
---
a/src/test/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandlerTest.java
+++
b/src/test/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandlerTest.java
@@ -382,4 +382,45 @@ public class ConfigurationApiMergeHandlerTest {
assertTrue(api.getInternalFrameworkProperties().contains("pb"));
assertTrue(api.getInternalFrameworkProperties().contains("pc"));
}
+
+@Test public void testConfigurationApiMergeRegionCache() {
+final BuilderContext context = new BuilderContext(id -> null);
+context.addMergeExtensions(new ConfigurationApiMergeHandler());
+
+final Feature featureA = new Feature(ArtifactId.parse("g:a:1"));
+final ConfigurationApi apiA = new ConfigurationApi();
+apiA.setRegion(Region.INTERNAL);
+ConfigurationApi.setConfigurationApi(featureA, apiA);
+
+final Feature featureB = new Feature(ArtifactId.parse("g:b:1"));
+final ConfigurationApi apiB = new ConfigurationApi();
+apiB.setRegion(Region.GLOBAL);
+ConfigurationApi.setConfigurationApi(featureB, apiB);
+
+
+final Feature featureC = new Feature(ArtifactId.parse("g:c:1"));
+final ConfigurationApi apiC = new ConfigurationApi();
+apiC.setRegion(Region.INTERNAL);
+ConfigurationApi.setConfigurationApi(featureC, apiC);
+
+final Feature featureD = new Feature(ArtifactId.parse("g:d:1"));
+final ConfigurationApi apiD = new ConfigurationApi();
+apiD.setRegion(Region.INTERNAL);
+ConfigurationApi.setConfigurationApi(featureD, apiD);
+
+final ArtifactId idIntermediate = ArtifactId.parse("g:i:1");
+Feature intermediate = FeatureBuilder.assemble(idIntermediate,
context, featureA, featureB);
+final ArtifactId id = ArtifactId.parse("g:m:1");
+Feature result = FeatureBuilder.assemble(id, context, featureC,
featureD, intermediate);
+ConfigurationApi api = ConfigurationApi.getConfigurationApi(result);
+assertNotNull(api);
+
+
+assertEquals(5, api.getFeatureToRegionCache().size());
+assertEquals(Region.INTERNAL,
api.getFeatureToRegionCache().get(featureA.getId()));
+assertEquals(Region.GLOBAL,
api.getFeatureToRegionCache().get(featureB.getId()));
+assertEquals(Region.INTERNAL,
api.getFeatureToRegionCache().get(featureC.getId()));
+assertEquals(Region.INTERNAL,
api.getFeatureToRegionCache().get(featureD.getId()));
+assertEquals(Region.GLOBAL,
api.getFeatureToRegionCache().get(idIntermediate));
+}
}
\ No newline at end of file
[sling-org-apache-sling-feature-cpconverter] branch master updated: Fix some bc issues around constructor signatures
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-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new 714e45e Fix some bc issues around constructor signatures
714e45e is described below
commit 714e45ef6d51e78ee133c5777e6dc1d08eed9528
Author: Karl Pauls
AuthorDate: Mon Feb 28 12:23:13 2022 +0100
Fix some bc issues around constructor signatures
---
.../feature/cpconverter/ContentPackage2FeatureModelConverter.java| 4
.../feature/cpconverter/handlers/DefaultEntryHandlersManager.java| 5 +
2 files changed, 9 insertions(+)
diff --git
a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
index 0d13bde..c077ab0 100644
---
a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++
b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -146,6 +146,10 @@ public class ContentPackage2FeatureModelConverter extends
BaseVaultPackageScanne
this(false, SlingInitialContentPolicy.KEEP, false);
}
+public ContentPackage2FeatureModelConverter(boolean strictValidation,
@NotNull SlingInitialContentPolicy slingInitialContentPolicy) throws
IOException {
+this(strictValidation, slingInitialContentPolicy, false);
+}
+
public ContentPackage2FeatureModelConverter(boolean strictValidation,
@NotNull SlingInitialContentPolicy slingInitialContentPolicy, boolean
disablePackageTypeRecalculation) throws IOException {
super(strictValidation);
this.disablePackageTypeRecalculation = disablePackageTypeRecalculation;
diff --git
a/src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryHandlersManager.java
b/src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryHandlersManager.java
index 0c63954..478f953 100644
---
a/src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryHandlersManager.java
+++
b/src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryHandlersManager.java
@@ -41,6 +41,11 @@ public class DefaultEntryHandlersManager implements
EntryHandlersManager {
);
}
+public DefaultEntryHandlersManager(@NotNull Map configs,
boolean enforceConfigurationsAndBundlesBelowProperFolder,
+@NotNull SlingInitialContentPolicy
slingInitialContentPolicy, @NotNull String systemUserRelPath) {
+this(configs, enforceConfigurationsAndBundlesBelowProperFolder,
slingInitialContentPolicy, new BundleSlingInitialContentExtractor(),
systemUserRelPath);
+}
+
public DefaultEntryHandlersManager(@NotNull Map configs,
boolean
enforceConfigurationsAndBundlesBelowProperFolder,
@NotNull SlingInitialContentPolicy
slingInitialContentPolicy,
[sling-org-apache-sling-feature-extension-apiregions] 01/01: SLING-11164: keep feature to region cache on feature merge
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch SLING-11164
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-apiregions.git
commit 61bfdf252643be9050188d60c704e74c6067079f
Author: Karl Pauls
AuthorDate: Mon Feb 28 11:58:19 2022 +0100
SLING-11164: keep feature to region cache on feature merge
---
.../apiregions/ConfigurationApiMergeHandler.java | 1 +
.../ConfigurationApiMergeHandlerTest.java | 41 ++
2 files changed, 42 insertions(+)
diff --git
a/src/main/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandler.java
b/src/main/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandler.java
index 082ee61..45bf7a6 100644
---
a/src/main/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandler.java
+++
b/src/main/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandler.java
@@ -101,6 +101,7 @@ public class ConfigurationApiMergeHandler implements
MergeHandler {
// update cache
if ( !context.isPrototypeMerge() ) {
targetApi.getFeatureToRegionCache().put(sourceFeature.getId(),
sourceApi.detectRegion());
+
targetApi.getFeatureToRegionCache().putAll(sourceApi.getFeatureToRegionCache());
}
ConfigurationApi.setConfigurationApi(targetFeature, targetApi);
diff --git
a/src/test/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandlerTest.java
b/src/test/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandlerTest.java
index f2fdb94..3231fbe 100644
---
a/src/test/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandlerTest.java
+++
b/src/test/java/org/apache/sling/feature/extension/apiregions/ConfigurationApiMergeHandlerTest.java
@@ -382,4 +382,45 @@ public class ConfigurationApiMergeHandlerTest {
assertTrue(api.getInternalFrameworkProperties().contains("pb"));
assertTrue(api.getInternalFrameworkProperties().contains("pc"));
}
+
+@Test public void testConfigurationApiMergeRegionCache() {
+final BuilderContext context = new BuilderContext(id -> null);
+context.addMergeExtensions(new ConfigurationApiMergeHandler());
+
+final Feature featureA = new Feature(ArtifactId.parse("g:a:1"));
+final ConfigurationApi apiA = new ConfigurationApi();
+apiA.setRegion(Region.INTERNAL);
+ConfigurationApi.setConfigurationApi(featureA, apiA);
+
+final Feature featureB = new Feature(ArtifactId.parse("g:b:1"));
+final ConfigurationApi apiB = new ConfigurationApi();
+apiB.setRegion(Region.GLOBAL);
+ConfigurationApi.setConfigurationApi(featureB, apiB);
+
+
+final Feature featureC = new Feature(ArtifactId.parse("g:c:1"));
+final ConfigurationApi apiC = new ConfigurationApi();
+apiC.setRegion(Region.INTERNAL);
+ConfigurationApi.setConfigurationApi(featureC, apiC);
+
+final Feature featureD = new Feature(ArtifactId.parse("g:d:1"));
+final ConfigurationApi apiD = new ConfigurationApi();
+apiD.setRegion(Region.INTERNAL);
+ConfigurationApi.setConfigurationApi(featureD, apiD);
+
+final ArtifactId idIntermediate = ArtifactId.parse("g:i:1");
+Feature intermediate = FeatureBuilder.assemble(idIntermediate,
context, featureA, featureB);
+final ArtifactId id = ArtifactId.parse("g:m:1");
+Feature result = FeatureBuilder.assemble(id, context, featureC,
featureD, intermediate);
+ConfigurationApi api = ConfigurationApi.getConfigurationApi(result);
+assertNotNull(api);
+
+
+assertEquals(5, api.getFeatureToRegionCache().size());
+assertEquals(Region.INTERNAL,
api.getFeatureToRegionCache().get(featureA.getId()));
+assertEquals(Region.GLOBAL,
api.getFeatureToRegionCache().get(featureB.getId()));
+assertEquals(Region.INTERNAL,
api.getFeatureToRegionCache().get(featureC.getId()));
+assertEquals(Region.INTERNAL,
api.getFeatureToRegionCache().get(featureD.getId()));
+assertEquals(Region.GLOBAL,
api.getFeatureToRegionCache().get(idIntermediate));
+}
}
\ No newline at end of file
[sling-org-apache-sling-feature-extension-apiregions] branch SLING-11164 created (now 61bfdf2)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch SLING-11164 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-apiregions.git. at 61bfdf2 SLING-11164: keep feature to region cache on feature merge This branch includes the following new commits: new 61bfdf2 SLING-11164: keep feature to region cache on feature merge The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-11155: only register a path for absolute servlets.
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-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 464b4bc SLING-11155: only register a path for absolute servlets.
464b4bc is described below
commit 464b4bce64440301be8d3b8e818cc61c1bef7c5e
Author: Karl Pauls
AuthorDate: Mon Feb 21 14:36:00 2022 +0100
SLING-11155: only register a path for absolute servlets.
---
.../internal/bundle/BundledScriptTracker.java | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
index 613b6ba..1cbb434 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
@@ -268,15 +268,18 @@ public class BundledScriptTracker implements
BundleTrackerCustomizer {
-String path;
-if
(resourceType.toString().startsWith("/")) {
-path = resourceType.toString() +
"/" + resourceType.getResourceLabel() + "." +
FilenameUtils.getExtension(scriptName);
-} else {
-path =
resourceResolverFactory.getSearchPath().get(0) + resourceType.toString() + "/"
+ resourceType.getResourceLabel() + "." +
FilenameUtils.getExtension(scriptName);
+String[] rts =
PropertiesUtil.toStringArray(properties.get(ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES));
+if (rts != null) {
+for (String resourceType : rts) {
+String path;
+if (resourceType.startsWith("/")) {
+path = resourceType + "/" +
resourceType.substring(resourceType.lastIndexOf('/') + 1) + "." +
FilenameUtils.getExtension(scriptName);
+} else {
+path =
resourceResolverFactory.getSearchPath().get(0) + resourceType + "/" +
resourceType.substring(resourceType.lastIndexOf('/') + 1) + "." +
FilenameUtils.getExtension(scriptName);
+}
+
properties.put(ServletResolverConstants.SLING_SERVLET_PATHS, path);
}
-
properties.put(ServletResolverConstants.SLING_SERVLET_PATHS, path);
-});
+}
}
}
if
(!properties.containsKey(ServletResolverConstants.SLING_SERVLET_PATHS)) {
[sling-org-apache-sling-scripting-bundle-tracker-it] branch master updated: SLING-11155 - Bundled scripts should be registered by path for the main script when overriding (#4)
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-scripting-bundle-tracker-it.git
The following commit(s) were added to refs/heads/master by this push:
new 3af8bcd SLING-11155 - Bundled scripts should be registered by path
for the main script when overriding (#4)
3af8bcd is described below
commit 3af8bcde8dbe965a3639b0d70470d011b1056159
Author: Karl Pauls
AuthorDate: Mon Feb 21 11:38:32 2022 +0100
SLING-11155 - Bundled scripts should be registered by path for the main
script when overriding (#4)
* SLING-11155: add a test case for SLING-11155 to make sure we don't
override the default GET servlet for proxies
* Update to latest scripting.core
---
.../main/resources/SLING-INF/content/examplebundle.xml | 9 +
it/pom.xml | 2 +-
.../scripting/bundle/tracker/it/ScriptMatchIT.java | 17 +
.../scripting/bundle/tracker/it/ScriptMatchPostIT.java | 13 -
4 files changed, 27 insertions(+), 14 deletions(-)
diff --git
a/examples/org-apache-sling-scripting-examplebundle/src/main/resources/SLING-INF/content/examplebundle.xml
b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/SLING-INF/content/examplebundle.xml
index 4d33f5f..f00925c 100644
---
a/examples/org-apache-sling-scripting-examplebundle/src/main/resources/SLING-INF/content/examplebundle.xml
+++
b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/SLING-INF/content/examplebundle.xml
@@ -89,4 +89,13 @@
String
+
+script-matching-no-version-rtsuper
+nt:unstructured
+
+sling:resourceType
+rtsuper
+String
+
+
diff --git a/it/pom.xml b/it/pom.xml
index 8b0fce8..5221057 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -182,7 +182,7 @@
org.apache.sling
org.apache.sling.scripting.core
-2.4.3-SNAPSHOT
+2.4.4
test
diff --git
a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchIT.java
b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchIT.java
index 88ee053..014cd68 100644
---
a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchIT.java
+++
b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchIT.java
@@ -133,6 +133,23 @@ public class ScriptMatchIT extends
AbstractEndpointTestBase {
".scriptmatching/1.0.0/selector-2.html"));
}
+/*
+ * We need to test that we don't override the default GET servlet for
resource types without a script
+ * This scenario can happen when we extend a resource type without
providing a script ourself
+ * in this case, the registration should not override the default servlets
for the none default extension.
+ * In other words, in this case, only the default extension should be
handled by the resource super type -
+ * all other extensions should be handled by the default servlet.
+ */
+@Test
+public void testDefaultGETServlet() throws Exception {
+// First test that the default extension is handled by the super type
+Document document = getDocument(SCRIPT_MATCHING_BASE +
"-no-version-rtsuper.html");
+assertTrue(document.html().contains("/libs/rtsuper"));
+// and now test that the none default json extension is not handled by
it
+document = getDocument(SCRIPT_MATCHING_BASE +
"-no-version-rtsuper.json");
+assertTrue(!document.html().contains("/libs/rtsuper"));
+}
+
private void testHttpMethodScriptMatching(String url, String httpMethod)
throws Exception {
Document document = getDocument(url, httpMethod);
String path = url.substring(url.lastIndexOf('/'));
diff --git
a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchPostIT.java
b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchPostIT.java
index cf3e78b..637cfbb 100644
---
a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchPostIT.java
+++
b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchPostIT.java
@@ -18,22 +18,9 @@
~*/
package org.apache.sling.scripting.bundle.tracker.it;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpOptions;
-import org.apache.http.client.methods.HttpPatch;
import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.meth
[sling-org-apache-sling-scripting-bundle-tracker-it] branch SLING-11155 updated (ebec239 -> 1776074)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch SLING-11155 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git. from ebec239 SLING-11155: add a test case for SLING-11155 to make sure we don't override the default GET servlet for proxies add 1776074 Update to latest scripting.core No new revisions were added by this update. Summary of changes: it/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-11155: bind proxy resource type registrations by path (#27)
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-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 18aee66 SLING-11155: bind proxy resource type registrations by path
(#27)
18aee66 is described below
commit 18aee66a0da5d2097ad5151aabdeace5e822132f
Author: Karl Pauls
AuthorDate: Mon Feb 21 10:49:37 2022 +0100
SLING-11155: bind proxy resource type registrations by path (#27)
---
.../resolver/internal/bundle/BundledScriptTracker.java| 11 +++
1 file changed, 11 insertions(+)
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
index 2519657..613b6ba 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
@@ -267,6 +267,17 @@ public class BundledScriptTracker implements
BundleTrackerCustomizer {
+String path;
+if
(resourceType.toString().startsWith("/")) {
+path = resourceType.toString() +
"/" + resourceType.getResourceLabel() + "." +
FilenameUtils.getExtension(scriptName);
+} else {
+path =
resourceResolverFactory.getSearchPath().get(0) + resourceType.toString() + "/"
+ resourceType.getResourceLabel() + "." +
FilenameUtils.getExtension(scriptName);
+}
+
properties.put(ServletResolverConstants.SLING_SERVLET_PATHS, path);
+});
+}
}
if
(!properties.containsKey(ServletResolverConstants.SLING_SERVLET_PATHS)) {
bundledRenderUnitCapability.getResourceTypes().forEach(resourceType -> {
[sling-org-apache-sling-scripting-bundle-tracker-it] branch SLING-11155 created (now ebec239)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch SLING-11155 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git. at ebec239 SLING-11155: add a test case for SLING-11155 to make sure we don't override the default GET servlet for proxies No new revisions were added by this update.
[sling-org-apache-sling-servlets-resolver] branch SLING-11155 created (now 4cd050c)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch SLING-11155 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git. at 4cd050c SLING-11155: bind proxy resource type registrations by path This branch includes the following new commits: new 4cd050c SLING-11155: bind proxy resource type registrations by path The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-org-apache-sling-servlets-resolver] 01/01: SLING-11155: bind proxy resource type registrations by path
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch SLING-11155
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit 4cd050c60c090c9d6b010c248277d9fd01ff155c
Author: Karl Pauls
AuthorDate: Mon Feb 21 10:33:39 2022 +0100
SLING-11155: bind proxy resource type registrations by path
---
.../resolver/internal/bundle/BundledScriptTracker.java| 11 +++
1 file changed, 11 insertions(+)
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
index 62f8726..a5360d5 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
@@ -267,6 +267,17 @@ public class BundledScriptTracker implements
BundleTrackerCustomizer {
+String path;
+if
(resourceType.toString().startsWith("/")) {
+path = resourceType.toString() +
"/" + resourceType.getResourceLabel() + "." +
FilenameUtils.getExtension(scriptName);
+} else {
+path =
resourceResolverFactory.getSearchPath().get(0) + resourceType.toString() + "/"
+ resourceType.getResourceLabel() + "." +
FilenameUtils.getExtension(scriptName);
+}
+
properties.put(ServletResolverConstants.SLING_SERVLET_PATHS, path);
+});
+}
}
if
(!properties.containsKey(ServletResolverConstants.SLING_SERVLET_PATHS)) {
bundledRenderUnitCapability.getResourceTypes().forEach(resourceType -> {
[sling-org-apache-sling-feature-launcher] branch master updated: SLING-11148: lookup the config admin with all services (#38)
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-feature-launcher.git
The following commit(s) were added to refs/heads/master by this push:
new 69a13b8 SLING-11148: lookup the config admin with all services (#38)
69a13b8 is described below
commit 69a13b8d740f4bbca120ff4210bf868e9210672a
Author: Karl Pauls
AuthorDate: Wed Feb 16 16:04:30 2022 +0100
SLING-11148: lookup the config admin with all services (#38)
---
.../apache/sling/feature/launcher/impl/launchers/AbstractRunner.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
index 0c56e27..ff80c43 100644
---
a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
+++
b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
@@ -173,7 +173,7 @@ public abstract class AbstractRunner implements
Callable {
// the filter is constant so this should really not happen
throw new RuntimeException(e);
}
-this.configAdminTracker.open();
+this.configAdminTracker.open(true);
} else if (!configurations.isEmpty()) {
this.configAdminTracker = new
ServiceTracker<>(framework.getBundleContext(),
@@ -203,7 +203,7 @@ public abstract class AbstractRunner implements
Callable {
// nothing to do
}
});
-this.configAdminTracker.open();
+this.configAdminTracker.open(true);
}
if ( !installables.isEmpty() ) {
this.installerTracker = new
ServiceTracker<>(framework.getBundleContext(),
[sling-org-apache-sling-feature-launcher] branch SLING-11148 created (now 7c518d7)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch SLING-11148 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git. at 7c518d7 SLING-11148: lookup the config admin with all services No new revisions were added by this update.
[sling-org-apache-sling-commons-compiler] 01/01: Merge pull request #3 from apache/issus/SLING-11144
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-commons-compiler.git commit ea815b1a87c35cb72077e553ee1773468c244466 Merge: 42a467f 375e9f8 Author: Karl Pauls AuthorDate: Tue Feb 15 11:44:59 2022 +0100 Merge pull request #3 from apache/issus/SLING-11144 SLING-11144: only don't write classes of a failed compilation unit .../org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[sling-org-apache-sling-commons-compiler] branch master updated (42a467f -> ea815b1)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git. from 42a467f SLING-11051 - Fixing JavaDoc badge add 375e9f8 SLING-11144: only don't write classes of a failed compilation unit new ea815b1 Merge pull request #3 from apache/issus/SLING-11144 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[sling-org-apache-sling-commons-compiler] 01/01: SLING-11144: only don't write classes of a failed compilation unit
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issus/SLING-11144
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit 375e9f8a9be5f89de5dec3f759a39e2c3cadf90b
Author: Karl Pauls
AuthorDate: Tue Feb 15 10:46:29 2022 +0100
SLING-11144: only don't write classes of a failed compilation unit
---
.../org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
b/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
index 40e4cab..4a99c3d 100644
---
a/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
+++
b/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
@@ -303,7 +303,7 @@ public class EclipseJavaCompiler implements JavaCompiler {
}
}
}
-if ( this.errorHandler.getErrors() == null ) {
+if (!result.hasErrors()) {
ClassFile[] classFiles = result.getClassFiles();
for (int i = 0; i < classFiles.length; i++) {
ClassFile classFile = classFiles[i];
[sling-org-apache-sling-commons-compiler] branch issus/SLING-11144 created (now 375e9f8)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issus/SLING-11144 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git. at 375e9f8 SLING-11144: only don't write classes of a failed compilation unit This branch includes the following new commits: new 375e9f8 SLING-11144: only don't write classes of a failed compilation unit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-jspc-maven-plugin] branch master updated: SLING-11099: add required dependencies in scope compile (#7)
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-jspc-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new fe025bc SLING-11099: add required dependencies in scope compile (#7)
fe025bc is described below
commit fe025bcfd090c0661febf25959d697373977a35d
Author: Karl Pauls
AuthorDate: Fri Jan 28 22:57:01 2022 +0100
SLING-11099: add required dependencies in scope compile (#7)
---
pom.xml | 25 +---
src/it/settings.xml | 53 +
src/it/simple/pom.xml | 49 ++
src/it/simple/src/main/scripts/test.jsp | 19
4 files changed, 142 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index cd5ca9f..4d88783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,23 @@
true
+
+org.apache.maven.plugins
+maven-invoker-plugin
+
+
${project.build.directory}/local-repo
+src/it/settings.xml
+
+
+
+integration-test
+
+install
+run
+
+
+
+
@@ -157,14 +174,14 @@
org.apache.felix
org.apache.felix.framework
-7.0.1
-provided
+7.0.3
+compile
org.apache.sling
org.apache.sling.feature
-1.2.28
-provided
+1.2.30
+compile
org.apache.felix
diff --git a/src/it/settings.xml b/src/it/settings.xml
new file mode 100644
index 000..3915771
--- /dev/null
+++ b/src/it/settings.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+it-repo
+
+true
+
+
+
+local.central
+@localRepositoryUrl@
+
+true
+
+
+true
+
+
+
+
+
+local.central
+@localRepositoryUrl@
+
+true
+
+
+true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/it/simple/pom.xml b/src/it/simple/pom.xml
new file mode 100644
index 000..e71b66a
--- /dev/null
+++ b/src/it/simple/pom.xml
@@ -0,0 +1,49 @@
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.sling
+jspc-maven-plugin-it-includes
+0.0.1-SNAPSHOT
+jar
+
+HTL Maven Plugin IT - Generate Java Classes
+
+
+
+
+org.apache.sling
+jspc-maven-plugin
+@project.version@
+
+true
+
+
+
+
+jspc
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/it/simple/src/main/scripts/test.jsp
b/src/it/simple/src/main/scripts/test.jsp
new file mode 100644
index 000..a47c742
--- /dev/null
+++ b/src/it/simple/src/main/scripts/test.jsp
@@ -0,0 +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.
+--%>
+test
\ No newline at end of file
[sling-jspc-maven-plugin] branch issues/SLING-11099 created (now 16345a1)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issues/SLING-11099 in repository https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git. at 16345a1 SLING-11099: add required dependencies in scope compile This branch includes the following new commits: new 16345a1 SLING-11099: add required dependencies in scope compile The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-jspc-maven-plugin] 01/01: SLING-11099: add required dependencies in scope compile
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issues/SLING-11099
in repository https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git
commit 16345a1f13d8602041fb8bb54ecaaaf92b41c37d
Author: Karl Pauls
AuthorDate: Fri Jan 28 22:50:50 2022 +0100
SLING-11099: add required dependencies in scope compile
---
pom.xml | 25 +---
src/it/settings.xml | 53 +
src/it/simple/pom.xml | 49 ++
src/it/simple/src/main/scripts/test.jsp | 19
4 files changed, 142 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index cd5ca9f..4d88783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,23 @@
true
+
+org.apache.maven.plugins
+maven-invoker-plugin
+
+
${project.build.directory}/local-repo
+src/it/settings.xml
+
+
+
+integration-test
+
+install
+run
+
+
+
+
@@ -157,14 +174,14 @@
org.apache.felix
org.apache.felix.framework
-7.0.1
-provided
+7.0.3
+compile
org.apache.sling
org.apache.sling.feature
-1.2.28
-provided
+1.2.30
+compile
org.apache.felix
diff --git a/src/it/settings.xml b/src/it/settings.xml
new file mode 100644
index 000..3915771
--- /dev/null
+++ b/src/it/settings.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+it-repo
+
+true
+
+
+
+local.central
+@localRepositoryUrl@
+
+true
+
+
+true
+
+
+
+
+
+local.central
+@localRepositoryUrl@
+
+true
+
+
+true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/it/simple/pom.xml b/src/it/simple/pom.xml
new file mode 100644
index 000..e71b66a
--- /dev/null
+++ b/src/it/simple/pom.xml
@@ -0,0 +1,49 @@
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.sling
+jspc-maven-plugin-it-includes
+0.0.1-SNAPSHOT
+jar
+
+HTL Maven Plugin IT - Generate Java Classes
+
+
+
+
+org.apache.sling
+jspc-maven-plugin
+@project.version@
+
+true
+
+
+
+
+jspc
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/it/simple/src/main/scripts/test.jsp
b/src/it/simple/src/main/scripts/test.jsp
new file mode 100644
index 000..a47c742
--- /dev/null
+++ b/src/it/simple/src/main/scripts/test.jsp
@@ -0,0 +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.
+--%>
+test
\ No newline at end of file
[sling-org-apache-sling-scripting-bundle-tracker-it] 01/01: Merge pull request #3 from apache/issues/SLING-11093
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-scripting-bundle-tracker-it.git commit 2230df10cb9d8474a5c868c0b60ecf563b437ee7 Merge: 70780b4 5e105fe Author: Karl Pauls AuthorDate: Wed Jan 26 18:36:45 2022 +0100 Merge pull request #3 from apache/issues/SLING-11093 SLING-11093: add a test that checks that we only register the absolut… .../src/main/scripts/libs/rtsuper/extends | 1 + .../src/main/scripts/apps/rtsuper/rtsuper.html | 19 + it/pom.xml | 2 +- .../it/ExampleBundlePrecompiledTeleportedIT.java | 24 ++ 4 files changed, 45 insertions(+), 1 deletion(-)
[sling-org-apache-sling-scripting-bundle-tracker-it] branch master updated (70780b4 -> 2230df1)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git.
from 70780b4 SLING-11051 - Fixing JavaDoc badge
add 5e105fe SLING-11093: add a test that checks that we only register the
absolute resource type if the relative resource type is the same
new 2230df1 Merge pull request #3 from apache/issues/SLING-11093
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/scripts/libs/rtsuper/extends | 1 +
.../path-script.html => rtsuper/rtsuper.html} | 2 +-
it/pom.xml | 2 +-
.../it/ExampleBundlePrecompiledTeleportedIT.java | 24 ++
4 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644
examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rtsuper/extends
copy
examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/{org.apache.sling.scripting.examplebundle.precompiled.path/path-script.html
=> rtsuper/rtsuper.html} (94%)
[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-11093: only register the absolute resource type if the relative resource type is the same (#26)
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-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new eb9743b SLING-11093: only register the absolute resource type if the
relative resource type is the same (#26)
eb9743b is described below
commit eb9743bd2086a9998105437e40b5f473990a7f07
Author: Karl Pauls
AuthorDate: Wed Jan 26 17:42:33 2022 +0100
SLING-11093: only register the absolute resource type if the relative
resource type is the same (#26)
---
.../resolver/internal/bundle/BundledScriptTracker.java | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
index 6454e63..62f8726 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/BundledScriptTracker.java
@@ -54,6 +54,7 @@ import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.request.RequestDispatcherOptions;
+import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.type.ResourceType;
import org.apache.sling.api.servlets.ServletResolverConstants;
@@ -110,6 +111,9 @@ public class BundledScriptTracker implements
BundleTrackerCustomizer bundleContext = new
AtomicReference<>();
private AtomicReference>>>
tracker = new AtomicReference<>();
private AtomicReference, ServiceRegistration>>
dispatchers = new AtomicReference<>();
@@ -163,11 +167,21 @@ public class BundledScriptTracker implements
BundleTrackerCustomizer inheritanceChain = new
LinkedHashSet<>();
inheritanceChain.add(baseTypeProvider);
if
(!bundledRenderUnitCapability.getResourceTypes().isEmpty()) {
-String[] resourceTypesRegistrationValue = new
String[bundledRenderUnitCapability.getResourceTypes().size()];
+LinkedHashSet
resourceTypesRegistrationValueSet = new LinkedHashSet<>();
int rtIndex = 0;
for (ResourceType resourceType :
bundledRenderUnitCapability.getResourceTypes()) {
-resourceTypesRegistrationValue[rtIndex++] =
resourceType.toString();
+
resourceTypesRegistrationValueSet.add(resourceType.toString());
}
+String[] resourceTypesRegistrationValue =
resourceTypesRegistrationValueSet.stream().filter(rt -> {
+if (!rt.startsWith("/")) {
+for (String prefix :
resourceResolverFactory.getSearchPath()) {
+if
(resourceTypesRegistrationValueSet.contains(prefix.concat(rt))) {
+return false;
+}
+}
+}
+return true;
+}).toArray(String[]::new);
properties.put(ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES,
resourceTypesRegistrationValue);
String extension =
bundledRenderUnitCapability.getExtension();
[sling-org-apache-sling-scripting-bundle-tracker-it] 01/01: SLING-11093: add a test that checks that we only register the absolute resource type if the relative resource type is the same
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issues/SLING-11093
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
commit 5e105fe2bdfe2ff18cc4f336e39b4cdf05c18dc7
Author: Karl Pauls
AuthorDate: Wed Jan 26 17:18:31 2022 +0100
SLING-11093: add a test that checks that we only register the absolute
resource type if the relative resource type is the same
---
.../src/main/scripts/libs/rtsuper/extends | 1 +
.../src/main/scripts/apps/rtsuper/rtsuper.html | 19 +
it/pom.xml | 2 +-
.../it/ExampleBundlePrecompiledTeleportedIT.java | 24 ++
4 files changed, 45 insertions(+), 1 deletion(-)
diff --git
a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rtsuper/extends
b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rtsuper/extends
new file mode 100644
index 000..f9263f5
--- /dev/null
+++
b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/libs/rtsuper/extends
@@ -0,0 +1 @@
+/apps/rtsuper
\ No newline at end of file
diff --git
a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rtsuper/rtsuper.html
b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rtsuper/rtsuper.html
new file mode 100644
index 000..bee4276
--- /dev/null
+++
b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/apps/rtsuper/rtsuper.html
@@ -0,0 +1,19 @@
+
+/libs/rtsuper
\ No newline at end of file
diff --git a/it/pom.xml b/it/pom.xml
index ac198b2..438a2b6 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -188,7 +188,7 @@
org.apache.sling
org.apache.sling.servlets.resolver
-2.9.1-SNAPSHOT
+2.9.3-SNAPSHOT
test
diff --git
a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java
b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java
index 0f18051..8a3d618 100644
---
a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java
+++
b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledTeleportedIT.java
@@ -28,6 +28,7 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.junit.Test;
+import static junit.framework.TestCase.assertNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -89,4 +90,27 @@ public class ExampleBundlePrecompiledTeleportedIT extends
AbstractTeleportedTest
}
}
}
+
+/*
+ * We need to test that if we register with an absolute resource type and
a relative one we are not ending up with
+ * a registration in the wrong prefix. As an example, when we register a
resource type called rtsuper we end up with a capability
+ * for [rtsuper,/apps/rtsuper]. That will make it so that the resolver
prepends the search path prefix (which is configurable).
+ * For a default configuration, this could end up being /apps/rtsuper or
/libs/rtsuper, based on the prefix value, which is a mistake
+ * because, in that case, the resource super type would be on both and
could cause a cycle.
+ *
+ * To recreate this scenario without changing the resolver config for the
prefix selection this test has the script in
+ * /apps and the extends in /libs with a value for /apps/rtsuper - hence,
we expect that we are not finding a super type
+ * on the script in /apps because otherwise it would have picked the wrong
prefix (which we avoid by not registering
+ * relative resource types when there is an absolute one for the same
resource type).
+ */
+@Test
+public void testRtSuper() throws LoginException {
+final String expectedRT = "rtsuper";
+ResourceResolverFactory resourceResolverFactory =
teleporter.getService(ResourceResolverFactory.class);
+try (ResourceResolver resolver =
resourceResolverFactory.getResourceResolver(AUTH_MAP)) {
+Resource main = resolver.resolve("/apps/" + expectedRT);
+assertNotNull(main);
+assertNull(main.getResourceSuperType());
+}
+}
}
[sling-org-apache-sling-scripting-bundle-tracker-it] branch issues/SLING-11093 created (now 5e105fe)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issues/SLING-11093 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git. at 5e105fe SLING-11093: add a test that checks that we only register the absolute resource type if the relative resource type is the same This branch includes the following new commits: new 5e105fe SLING-11093: add a test that checks that we only register the absolute resource type if the relative resource type is the same The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-org-apache-sling-servlets-resolver] branch issues/SLING-11093 created (now 4b343e0)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issues/SLING-11093 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git. at 4b343e0 SLING-11093: only register the absolute resource type if the relative resource type is the same No new revisions were added by this update.
[sling-org-apache-sling-feature-cpconverter] branch master updated: SLING-11075: strip attributes from bsn (#127)
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-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new dbcfabd SLING-11075: strip attributes from bsn (#127)
dbcfabd is described below
commit dbcfabd2ba13582e1e0662908eb5057f614c072a
Author: Karl Pauls
AuthorDate: Wed Jan 19 13:22:39 2022 +0100
SLING-11075: strip attributes from bsn (#127)
---
.../cpconverter/handlers/BundleEntryHandler.java | 12
.../handlers/AbstractBundleEntryHandlerTest.java | 1 +
.../handlers/BundleEntryHandlerGAVTest.java| 13 +
.../sling/feature/cpconverter/handlers/peaberry.jar| Bin 0 -> 193114 bytes
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
b/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
index 4412fea..87f2ca8 100644
---
a/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
+++
b/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
@@ -34,6 +34,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.felix.utils.manifest.Clause;
import org.apache.felix.utils.manifest.Parser;
import org.apache.jackrabbit.vault.fs.io.Archive;
@@ -236,7 +237,7 @@ public class BundleEntryHandler extends
AbstractRegexEntryHandler {
if (groupId == null) {
// maybe the included jar is just an OSGi bundle but not a valid
Maven artifact
-groupId = getCheckedProperty(jarFile.getManifest(),
Constants.BUNDLE_SYMBOLICNAME);
+groupId =
StringUtils.substringBefore(getCheckedProperty(jarFile.getManifest(),
Constants.BUNDLE_SYMBOLICNAME), ";");
// Make sure there are not spaces in the name to adhere to the
Maven Group Id specification
groupId = groupId.replace(' ', '_').replace(':', '_').replace('/',
'_').replace('\\', '_');
if (groupId.indexOf('.') != -1) {
@@ -252,14 +253,17 @@ public class BundleEntryHandler extends
AbstractRegexEntryHandler {
// create artifact and store symbolic name and version in metadata
final Artifact result = new Artifact(new ArtifactId(groupId,
artifactId, version, classifier, JAR_TYPE));
-setMetadataFromManifest(jarFile.getManifest(),
Constants.BUNDLE_VERSION, result);
-setMetadataFromManifest(jarFile.getManifest(),
Constants.BUNDLE_SYMBOLICNAME, result);
+setMetadataFromManifest(jarFile.getManifest(),
Constants.BUNDLE_VERSION, result, false);
+setMetadataFromManifest(jarFile.getManifest(),
Constants.BUNDLE_SYMBOLICNAME, result, true);
return result;
}
-private static void setMetadataFromManifest(@NotNull Manifest manifest,
@NotNull String name, @NotNull Artifact artifact) {
+private static void setMetadataFromManifest(@NotNull Manifest manifest,
@NotNull String name, @NotNull Artifact artifact, boolean strip) {
String value = manifest.getMainAttributes().getValue(name);
+if (strip) {
+value = StringUtils.substringBefore(value, ";");
+}
if (value != null) {
artifact.getMetadata().put(name, value);
}
diff --git
a/src/test/java/org/apache/sling/feature/cpconverter/handlers/AbstractBundleEntryHandlerTest.java
b/src/test/java/org/apache/sling/feature/cpconverter/handlers/AbstractBundleEntryHandlerTest.java
index a4b1162..edd539f 100644
---
a/src/test/java/org/apache/sling/feature/cpconverter/handlers/AbstractBundleEntryHandlerTest.java
+++
b/src/test/java/org/apache/sling/feature/cpconverter/handlers/AbstractBundleEntryHandlerTest.java
@@ -60,6 +60,7 @@ public abstract class AbstractBundleEntryHandlerTest {
@Before
public void setUp() throws IOException {
handler = new BundleEntryHandler();
+
handler.setSlingInitialContentPolicy(ContentPackage2FeatureModelConverter.SlingInitialContentPolicy.KEEP);
ArtifactsDeployer deployer = Mockito.spy(ArtifactsDeployer.class);
when(converter.getArtifactsDeployer()).thenReturn(deployer);
when(converter.getTempDirectory()).thenReturn(tmpFolder.getRoot());
diff --git
a/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerGAVTest.java
b/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerGAVTest.java
index 820e737..c013f80 100644
---
a/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerGAVTest.java
+++
b/src/test/java/org/apache/sling/feat
[sling-org-apache-sling-feature-cpconverter] branch issues/SLING-11075 updated (1563511 -> c33ee31)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issues/SLING-11075 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git. from 1563511 SLING-11075: strip attributes from bsn add c33ee31 Use StringUtils No new revisions were added by this update. Summary of changes: .../feature/cpconverter/handlers/BundleEntryHandler.java | 16 +++- 1 file changed, 3 insertions(+), 13 deletions(-)
[sling-org-apache-sling-feature-cpconverter] branch issues/SLING-11075 created (now 1563511)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch issues/SLING-11075 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git. at 1563511 SLING-11075: strip attributes from bsn This branch includes the following new commits: new 1563511 SLING-11075: strip attributes from bsn The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[sling-org-apache-sling-feature-cpconverter] 01/01: SLING-11075: strip attributes from bsn
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issues/SLING-11075
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
commit 156351108f58111909c21b96adf0224fe5bf67a4
Author: Karl Pauls
AuthorDate: Wed Jan 19 13:06:24 2022 +0100
SLING-11075: strip attributes from bsn
---
.../cpconverter/handlers/BundleEntryHandler.java | 22 +
.../handlers/AbstractBundleEntryHandlerTest.java | 1 +
.../handlers/BundleEntryHandlerGAVTest.java| 13
.../feature/cpconverter/handlers/peaberry.jar | Bin 0 -> 193114 bytes
4 files changed, 32 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
b/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
index 4412fea..812edf7 100644
---
a/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
+++
b/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
@@ -236,7 +236,7 @@ public class BundleEntryHandler extends
AbstractRegexEntryHandler {
if (groupId == null) {
// maybe the included jar is just an OSGi bundle but not a valid
Maven artifact
-groupId = getCheckedProperty(jarFile.getManifest(),
Constants.BUNDLE_SYMBOLICNAME);
+groupId = getName(getCheckedProperty(jarFile.getManifest(),
Constants.BUNDLE_SYMBOLICNAME));
// Make sure there are not spaces in the name to adhere to the
Maven Group Id specification
groupId = groupId.replace(' ', '_').replace(':', '_').replace('/',
'_').replace('\\', '_');
if (groupId.indexOf('.') != -1) {
@@ -252,19 +252,33 @@ public class BundleEntryHandler extends
AbstractRegexEntryHandler {
// create artifact and store symbolic name and version in metadata
final Artifact result = new Artifact(new ArtifactId(groupId,
artifactId, version, classifier, JAR_TYPE));
-setMetadataFromManifest(jarFile.getManifest(),
Constants.BUNDLE_VERSION, result);
-setMetadataFromManifest(jarFile.getManifest(),
Constants.BUNDLE_SYMBOLICNAME, result);
+setMetadataFromManifest(jarFile.getManifest(),
Constants.BUNDLE_VERSION, result, false);
+setMetadataFromManifest(jarFile.getManifest(),
Constants.BUNDLE_SYMBOLICNAME, result, true);
return result;
}
-private static void setMetadataFromManifest(@NotNull Manifest manifest,
@NotNull String name, @NotNull Artifact artifact) {
+private static void setMetadataFromManifest(@NotNull Manifest manifest,
@NotNull String name, @NotNull Artifact artifact, boolean strip) {
String value = manifest.getMainAttributes().getValue(name);
+if (strip) {
+value = getName(value);
+}
if (value != null) {
artifact.getMetadata().put(name, value);
}
}
+private static @Nullable String getName(@Nullable String headerValue) {
+if (headerValue == null) {
+return null;
+}
+int idx = headerValue.indexOf(';');
+if (idx != -1) {
+return headerValue.substring(0, idx);
+}
+return headerValue;
+}
+
private static @NotNull String getCheckedProperty(@NotNull Manifest
manifest, @NotNull String name) {
String property = manifest.getMainAttributes().getValue(name);
if (property != null) {
diff --git
a/src/test/java/org/apache/sling/feature/cpconverter/handlers/AbstractBundleEntryHandlerTest.java
b/src/test/java/org/apache/sling/feature/cpconverter/handlers/AbstractBundleEntryHandlerTest.java
index a4b1162..edd539f 100644
---
a/src/test/java/org/apache/sling/feature/cpconverter/handlers/AbstractBundleEntryHandlerTest.java
+++
b/src/test/java/org/apache/sling/feature/cpconverter/handlers/AbstractBundleEntryHandlerTest.java
@@ -60,6 +60,7 @@ public abstract class AbstractBundleEntryHandlerTest {
@Before
public void setUp() throws IOException {
handler = new BundleEntryHandler();
+
handler.setSlingInitialContentPolicy(ContentPackage2FeatureModelConverter.SlingInitialContentPolicy.KEEP);
ArtifactsDeployer deployer = Mockito.spy(ArtifactsDeployer.class);
when(converter.getArtifactsDeployer()).thenReturn(deployer);
when(converter.getTempDirectory()).thenReturn(tmpFolder.getRoot());
diff --git
a/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerGAVTest.java
b/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerGAVTest.java
index 820e737..c013f80 100644
---
a/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerGAVTest.java
+++
b/src/test/java/org/a
[sling-org-apache-sling-feature-cpconverter] branch master updated: Update to latest feature model releases
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-feature-cpconverter.git The following commit(s) were added to refs/heads/master by this push: new 63cff04 Update to latest feature model releases 63cff04 is described below commit 63cff0498cd7863fd097a6553bb483a9ee29ec82 Author: Karl Pauls AuthorDate: Wed Jan 19 09:11:10 2022 +0100 Update to latest feature model releases --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3c0aa14..2a030c5 100644 --- a/pom.xml +++ b/pom.xml @@ -112,13 +112,13 @@ org.apache.sling org.apache.sling.feature - 1.2.28 + 1.2.30 compile org.apache.sling org.apache.sling.feature.extension.apiregions - 1.4.0 + 1.4.4 compile
[sling-org-apache-sling-feature-cpconverter] branch master updated: SLING-11072 - Add flag to force recalculation of content packages in sling initial content (#126)
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-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new 0bda240 SLING-11072 - Add flag to force recalculation of content
packages in sling initial content (#126)
0bda240 is described below
commit 0bda2403df03cd3b39b7cf35498ad78a94356eef
Author: Niek Raaijmakers
AuthorDate: Wed Jan 19 08:13:51 2022 +0100
SLING-11072 - Add flag to force recalculation of content packages in sling
initial content (#126)
---
.../ContentPackage2FeatureModelConverter.java | 11 +++--
...ntentPackage2FeatureModelConverterLauncher.java | 5 +-
.../handlers/DefaultEntryHandlersManager.java | 14 --
.../cpconverter/vltpkg/VaultPackageAssembler.java | 23 ++---
.../cpconverter/vltpkg/VaultPackageUtils.java | 8 +++-
.../vltpkg/VaultPackageAssemblerTest.java | 4 +-
.../VaultPackageAssemblerUnparameterizedTest.java | 54 +-
7 files changed, 88 insertions(+), 31 deletions(-)
diff --git
a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
index f342e41..0d13bde 100644
---
a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++
b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -106,6 +106,8 @@ public class ContentPackage2FeatureModelConverter extends
BaseVaultPackageScanne
private boolean removeInstallHooks = false;
+private boolean disablePackageTypeRecalculation = false;
+
private BundleSlingInitialContentExtractor
bundleSlingInitialContentExtractor = new BundleSlingInitialContentExtractor();
public enum PackagePolicy {
@@ -141,11 +143,12 @@ public class ContentPackage2FeatureModelConverter extends
BaseVaultPackageScanne
}
public ContentPackage2FeatureModelConverter() throws IOException {
-this(false, SlingInitialContentPolicy.KEEP);
+this(false, SlingInitialContentPolicy.KEEP, false);
}
-public ContentPackage2FeatureModelConverter(boolean strictValidation,
@NotNull SlingInitialContentPolicy slingInitialContentPolicy) throws
IOException {
+public ContentPackage2FeatureModelConverter(boolean strictValidation,
@NotNull SlingInitialContentPolicy slingInitialContentPolicy, boolean
disablePackageTypeRecalculation) throws IOException {
super(strictValidation);
+this.disablePackageTypeRecalculation = disablePackageTypeRecalculation;
this.recollectorVaultPackageScanner = new
RecollectorVaultPackageScanner(this, this.packageManager, strictValidation,
subContentPackages, slingInitialContentPolicy);
this.tmpDirectory =
Files.createTempDirectory("cp2fm-converter").toFile();
}
@@ -290,7 +293,7 @@ public class ContentPackage2FeatureModelConverter extends
BaseVaultPackageScanne
for (VaultPackage vaultPackage : orderedContentPackages) {
try {
emitters.stream().forEach(e -> e.startPackage(vaultPackage));
-
setMainPackageAssembler(VaultPackageAssembler.create(this.getTempDirectory(),
vaultPackage, removeInstallHooks));
+
setMainPackageAssembler(VaultPackageAssembler.create(this.getTempDirectory(),
vaultPackage, removeInstallHooks, disablePackageTypeRecalculation));
assemblers.add(getMainPackageAssembler());
ArtifactId mvnPackageId = toArtifactId(vaultPackage.getId(),
vaultPackage.getFile());
@@ -367,7 +370,7 @@ public class ContentPackage2FeatureModelConverter extends
BaseVaultPackageScanne
emitters.stream().forEach(e -> e.startSubPackage(path, vaultPackage));
-VaultPackageAssembler clonedPackage =
VaultPackageAssembler.create(this.getTempDirectory(), vaultPackage,
removeInstallHooks);
+VaultPackageAssembler clonedPackage =
VaultPackageAssembler.create(this.getTempDirectory(), vaultPackage,
removeInstallHooks,disablePackageTypeRecalculation);
// Please note: THIS IS A HACK to meet the new requirement without
drastically change the original design
// temporary swap the main handler to collect stuff
diff --git
a/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
b/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
index d7ccbfa..59098fb 100644
---
a/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
+++
b/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
@@ -130,6 +130,9 @@ pu
[sling-org-apache-sling-xss] 01/01: Remove antiysamy dep - still incomplete
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch noanitsamydep
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
commit 7dfec26f001ba5d72167ea47dccbbd4bfaad07a0
Author: Karl Pauls
AuthorDate: Thu Dec 23 12:02:51 2021 +0100
Remove antiysamy dep - still incomplete
---
pom.xml| 10 +-
.../org/apache/sling/xss/impl/FallbackATag.java| 14 +-
.../apache/sling/xss/impl/FallbackSlingPolicy.java | 34 +-
.../java/org/apache/sling/xss/impl/XSSAPIImpl.java | 4 +
.../org/apache/sling/xss/impl/XSSFilterImpl.java | 23 +-
.../java/org/owasp/validator/html/AntiSamy.java| 17 +
.../org/owasp/validator/html/CleanResults.java | 17 +
src/main/java/org/owasp/validator/html/Policy.java | 464 +
.../org/owasp/validator/html/PolicyException.java | 9 +
.../org/owasp/validator/html/ScanException.java| 4 +
.../org/owasp/validator/html/model/Attribute.java | 39 ++
.../org/owasp/validator/html/model/Property.java | 22 +
.../java/org/owasp/validator/html/model/Tag.java | 41 ++
.../org/owasp/validator/html/util/XMLUtil.java | 209 ++
src/main/resources/antisamy.xsd| 147 +++
15 files changed, 1001 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index 575edef..6c419e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,12 +185,6 @@
-org.owasp.antisamy
-antisamy
-1.5.10
-provided
-
-
xml-apis
xml-apis
1.4.01
@@ -216,6 +210,10 @@
commons-collections
commons-collections
+
+org.owasp.antisamy
+antisamy
+
diff --git a/src/main/java/org/apache/sling/xss/impl/FallbackATag.java
b/src/main/java/org/apache/sling/xss/impl/FallbackATag.java
index a94de65..04b32b7 100644
--- a/src/main/java/org/apache/sling/xss/impl/FallbackATag.java
+++ b/src/main/java/org/apache/sling/xss/impl/FallbackATag.java
@@ -18,8 +18,6 @@
~*/
package org.apache.sling.xss.impl;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import org.owasp.validator.html.model.Attribute;
@@ -27,16 +25,6 @@ import org.owasp.validator.html.model.Tag;
public class FallbackATag extends Tag {
-static final Attribute FALLBACK_HREF_ATTRIBUTE = new Attribute(
-"href",
-Arrays.asList(
-XSSFilterImpl.ON_SITE_SIMPLIFIED,
-XSSFilterImpl.OFF_SITE_SIMPLIFIED
-),
-Collections.emptyList(),
-"removeAttribute", ""
-);
-
private final Tag wrapped;
public FallbackATag(Tag wrapped) {
@@ -72,7 +60,7 @@ public class FallbackATag extends Tag {
@Override
public Attribute getAttributeByName(String name) {
if ("href".equalsIgnoreCase(name)) {
-return FALLBACK_HREF_ATTRIBUTE;
+return XSSFilterImpl.FALLBACK_HREF_ATTRIBUTE;
}
return wrapped.getAttributeByName(name);
}
diff --git a/src/main/java/org/apache/sling/xss/impl/FallbackSlingPolicy.java
b/src/main/java/org/apache/sling/xss/impl/FallbackSlingPolicy.java
index ddf4d0d..6213f2f 100644
--- a/src/main/java/org/apache/sling/xss/impl/FallbackSlingPolicy.java
+++ b/src/main/java/org/apache/sling/xss/impl/FallbackSlingPolicy.java
@@ -20,36 +20,18 @@ package org.apache.sling.xss.impl;
import java.io.InputStream;
-import org.owasp.validator.html.InternalPolicy;
+import org.owasp.validator.html.Policy;
import org.owasp.validator.html.PolicyException;
import org.owasp.validator.html.model.Tag;
-import org.xml.sax.InputSource;
-public class FallbackSlingPolicy extends InternalPolicy {
-
-private FallbackATag fallbackATag;
-private final Object aTagLock = new Object();
+public class FallbackSlingPolicy extends Policy {
public FallbackSlingPolicy(InputStream inputStream) throws PolicyException
{
- super(null, getSimpleParseContext(getTopLevelElement(new
InputSource(inputStream;
-
-}
-
-@Override
-public Tag getTagByLowercaseName(String tagName) {
-if ("a".equalsIgnoreCase(tagName)) {
-synchronized (aTagLock) {
-if (fallbackATag == null) {
-Tag wrapped = super.getTagByLowercaseName(tagName);
-if (wrapped != null) {
-fallbackATag = new FallbackATag(wrapped);
-}
-}
-}
-if (fallbackATag != null) {
-return fallbackATag;
-}
-}
-return super.getTagByLowercaseName
[sling-org-apache-sling-xss] branch noanitsamydep created (now 7dfec26)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to branch noanitsamydep in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git. at 7dfec26 Remove antiysamy dep - still incomplete This branch includes the following new commits: new 7dfec26 Remove antiysamy dep - still incomplete The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
svn commit: r51674 [1/2] - /release/sling/
Author: pauls Date: Tue Dec 21 09:05:57 2021 New Revision: 51674 Log: Add the Apache Sling Commons Johnzon 1.2.14, Feature Model Launcher 1.1.28, Launchpad Base 2.7.6, Servlets Resolver 2.9.2, Scripting Core 2.4.2, Scripting Bundle Maven Plugin 0.5.2, and JSPC Maven Plugin 2.3.2 release Added: release/sling/jspc-maven-plugin-2.3.2-javadoc.jar (with props) release/sling/jspc-maven-plugin-2.3.2-javadoc.jar.asc release/sling/jspc-maven-plugin-2.3.2-javadoc.jar.sha1 release/sling/jspc-maven-plugin-2.3.2-source-release.zip (with props) release/sling/jspc-maven-plugin-2.3.2-source-release.zip.asc release/sling/jspc-maven-plugin-2.3.2-source-release.zip.sha1 release/sling/jspc-maven-plugin-2.3.2-source-release.zip.sha512 release/sling/jspc-maven-plugin-2.3.2-source-release.zip.sha512.sha1 release/sling/jspc-maven-plugin-2.3.2-sources.jar (with props) release/sling/jspc-maven-plugin-2.3.2-sources.jar.asc release/sling/jspc-maven-plugin-2.3.2-sources.jar.sha1 release/sling/jspc-maven-plugin-2.3.2.jar (with props) release/sling/jspc-maven-plugin-2.3.2.jar.asc release/sling/jspc-maven-plugin-2.3.2.jar.sha1 release/sling/jspc-maven-plugin-2.3.2.pom release/sling/jspc-maven-plugin-2.3.2.pom.asc release/sling/jspc-maven-plugin-2.3.2.pom.sha1 release/sling/org.apache.sling.commons.johnzon-1.2.14-javadoc.jar (with props) release/sling/org.apache.sling.commons.johnzon-1.2.14-javadoc.jar.asc release/sling/org.apache.sling.commons.johnzon-1.2.14-javadoc.jar.sha1 release/sling/org.apache.sling.commons.johnzon-1.2.14-source-release.zip (with props) release/sling/org.apache.sling.commons.johnzon-1.2.14-source-release.zip.asc release/sling/org.apache.sling.commons.johnzon-1.2.14-source-release.zip.sha1 release/sling/org.apache.sling.commons.johnzon-1.2.14-source-release.zip.sha512 release/sling/org.apache.sling.commons.johnzon-1.2.14-source-release.zip.sha512.sha1 release/sling/org.apache.sling.commons.johnzon-1.2.14-sources.jar (with props) release/sling/org.apache.sling.commons.johnzon-1.2.14-sources.jar.asc release/sling/org.apache.sling.commons.johnzon-1.2.14-sources.jar.sha1 release/sling/org.apache.sling.commons.johnzon-1.2.14.jar (with props) release/sling/org.apache.sling.commons.johnzon-1.2.14.jar.asc release/sling/org.apache.sling.commons.johnzon-1.2.14.jar.sha1 release/sling/org.apache.sling.commons.johnzon-1.2.14.pom release/sling/org.apache.sling.commons.johnzon-1.2.14.pom.asc release/sling/org.apache.sling.commons.johnzon-1.2.14.pom.sha1 release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-app.jar (with props) release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-app.jar.asc release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-app.jar.sha1 release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-source-release.zip (with props) release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-source-release.zip.asc release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-source-release.zip.sha1 release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-sources.jar (with props) release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-sources.jar.asc release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-sources.jar.sha1 release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-webapp.war (with props) release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-webapp.war.asc release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6-webapp.war.sha1 release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6.jar (with props) release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6.jar.asc release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6.jar.sha1 release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6.pom release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6.pom.asc release/sling/org.apache.sling.launchpad.base-7.0.3-2.7.6.pom.sha1 release/sling/org.apache.sling.scripting.core-2.4.2-javadoc.jar (with props) release/sling/org.apache.sling.scripting.core-2.4.2-javadoc.jar.asc release/sling/org.apache.sling.scripting.core-2.4.2-javadoc.jar.sha1 release/sling/org.apache.sling.scripting.core-2.4.2-source-release.zip (with props) release/sling/org.apache.sling.scripting.core-2.4.2-source-release.zip.asc release/sling/org.apache.sling.scripting.core-2.4.2-source-release.zip.sha1 release/sling/org.apache.sling.scripting.core-2.4.2-source-release.zip.sha512 release/sling/org.apache.sling.scripting.core-2.4.2-source-release.zip.sha512.sha1 release/sling/org.apache.sling.scripting.core-2.4.2-sources.jar (with props) release/sling/org.apache.sling.scripting.core-2.4.2-sources.jar.asc release/sling/org.apache.sling.scripting.core-2.4.2-sources.jar.sha1 release/sling/org.apache.sling.scripting.core-2.4.2
svn commit: r51674 [2/2] - /release/sling/
Added: release/sling/org.apache.sling.scripting.core-2.4.2.pom.asc == --- release/sling/org.apache.sling.scripting.core-2.4.2.pom.asc (added) +++ release/sling/org.apache.sling.scripting.core-2.4.2.pom.asc Tue Dec 21 09:05:57 2021 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABEKAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCYbtHSAAKCRCQVII6hZpy +N23EAKCeh4jTqDV3N2LAb+VU/cLEWRHfCQCfRieWf1PTaNkvg4kWGu0Cc2Qn+Ek= +=ln6i +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.scripting.core-2.4.2.pom.sha1 == --- release/sling/org.apache.sling.scripting.core-2.4.2.pom.sha1 (added) +++ release/sling/org.apache.sling.scripting.core-2.4.2.pom.sha1 Tue Dec 21 09:05:57 2021 @@ -0,0 +1 @@ +a0aec0dd6984b596607c9bbe21bf3809162e6e0e \ No newline at end of file Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.servlets.resolver-2.9.2-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-javadoc.jar.asc == --- release/sling/org.apache.sling.servlets.resolver-2.9.2-javadoc.jar.asc (added) +++ release/sling/org.apache.sling.servlets.resolver-2.9.2-javadoc.jar.asc Tue Dec 21 09:05:57 2021 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABEKAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCYbtGQQAKCRCQVII6hZpy +N6YkAJ9UCpVZ8jnHYkffs+VDyet4WrqkPwCglcUJqlHd+fZGlabBWpU43GA4OOA= +=t7Ho +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-javadoc.jar.sha1 == --- release/sling/org.apache.sling.servlets.resolver-2.9.2-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.servlets.resolver-2.9.2-javadoc.jar.sha1 Tue Dec 21 09:05:57 2021 @@ -0,0 +1 @@ +36a516a11cc2a4794697ce7847258de9f37f7197 \ No newline at end of file Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip -- svn:mime-type = application/octet-stream Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.asc == --- release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.asc (added) +++ release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.asc Tue Dec 21 09:05:57 2021 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABEKAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCYbtGQQAKCRCQVII6hZpy +N7ilAKCo1iN4jmRMk40MV5s9dOaowRdfSQCgpDM5SPKoIw9mnSRPvkBnMLq+1DI= +=2SKn +-END PGP SIGNATURE- Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha1 == --- release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha1 (added) +++ release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha1 Tue Dec 21 09:05:57 2021 @@ -0,0 +1 @@ +166aca198979928f81576f708a904d0ab703bb4f \ No newline at end of file Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha512 == --- release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha512 (added) +++ release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha512 Tue Dec 21 09:05:57 2021 @@ -0,0 +1 @@ +72b0411efd21c2deefcfb51648e95fed11f5b3ee0984dddcac429f10712c11aff096d9901879dc8a8c976c80e4c4fa6409169ccfb6d8f42f7eea77356c15388b \ No newline at end of file Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha512.sha1 == --- release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha512.sha1 (added) +++ release/sling/org.apache.sling.servlets.resolver-2.9.2-source-release.zip.sha512.sha1 Tue Dec 21 09:05:57 2021 @@ -0,0 +1 @@ +4f137c1b16604508e9508f79fd5aec8f26b35f66 \ No newline at end of file Added: release/sling/org.apache.sling.servlets.resolver-2.9.2-sources.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling
[sling-org-apache-sling-feature-cpconverter] branch master updated: SLING-10929 : Wrap the exceptions of onFile an provide a path to the output (#121)
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-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new 1fa6255 SLING-10929 : Wrap the exceptions of onFile an provide a path
to the output (#121)
1fa6255 is described below
commit 1fa6255a2f5b4f12db6ba0c2e2db22f0dd32daaf
Author: Niek Raaijmakers
AuthorDate: Thu Dec 16 15:08:51 2021 +0100
SLING-10929 : Wrap the exceptions of onFile an provide a path to the output
(#121)
Co-authored-by: Niek Raaijmakers
---
.../feature/cpconverter/ContentPackage2FeatureModelConverter.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
index a158fa5..4ac12b7 100644
---
a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++
b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -496,7 +496,13 @@ public class ContentPackage2FeatureModelConverter extends
BaseVaultPackageScanne
@Override
protected void onFile(@NotNull String entryPath, @NotNull Archive archive,
@NotNull Entry entry) throws IOException, ConverterException {
-process(entryPath, archive, entry);
+try {
+process(entryPath, archive, entry);
+} catch (ConverterException ex) {
+throw new ConverterException("ConverterException occured on path "
+ entryPath + " with message: " + ex.getMessage(), ex);
+} catch (IOException ex) {
+throw new IOException("IOException occured on path " + entryPath +
" with message: " + ex.getMessage(), ex);
+}
}
public static @NotNull ArtifactId toArtifactId(@NotNull PackageId
packageId, @NotNull File file) {
[sling-jspc-maven-plugin] 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-jspc-maven-plugin.git The following commit(s) were added to refs/heads/master by this push: new a6c0b5e [maven-release-plugin] prepare for next development iteration a6c0b5e is described below commit a6c0b5ed19a41014eba0473c03e2fa78b0b41692 Author: Karl Pauls AuthorDate: Thu Dec 16 15:07:55 2021 +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 3d0460f..cd5ca9f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ jspc-maven-plugin -2.3.2 +2.3.3-SNAPSHOT maven-plugin Apache Sling JSPC Maven Plugin @@ -39,7 +39,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git scm:git:https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git https://gitbox.apache.org/repos/asf?p=sling-jspc-maven-plugin.git - jspc-maven-plugin-2.3.2 + HEAD
[sling-jspc-maven-plugin] annotated tag jspc-maven-plugin-2.3.2 created (now 7efff72)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag jspc-maven-plugin-2.3.2 in repository https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git. at 7efff72 (tag) tagging c5d769b255250668a9dfb86206b022666f654c27 (commit) replaces jspc-maven-plugin-2.3.0 by Karl Pauls on Thu Dec 16 15:07:51 2021 +0100 - Log - [maven-release-plugin] copy for tag jspc-maven-plugin-2.3.2 --- No new revisions were added by this update.
[sling-jspc-maven-plugin] branch master updated: Set scripting jsp to 2.5.4
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-jspc-maven-plugin.git The following commit(s) were added to refs/heads/master by this push: new 1d6f2d9 Set scripting jsp to 2.5.4 1d6f2d9 is described below commit 1d6f2d97c073142e8d567cc8c39405fa781a5f26 Author: Karl Pauls AuthorDate: Thu Dec 16 15:07:17 2021 +0100 Set scripting jsp to 2.5.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79e3722..5139184 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ org.apache.sling org.apache.sling.scripting.jsp -2.5.5-SNAPSHOT +2.5.4 compile
[sling-jspc-maven-plugin] branch master updated: [maven-release-plugin] prepare release jspc-maven-plugin-2.3.2
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-jspc-maven-plugin.git The following commit(s) were added to refs/heads/master by this push: new c5d769b [maven-release-plugin] prepare release jspc-maven-plugin-2.3.2 c5d769b is described below commit c5d769b255250668a9dfb86206b022666f654c27 Author: Karl Pauls AuthorDate: Thu Dec 16 15:07:48 2021 +0100 [maven-release-plugin] prepare release jspc-maven-plugin-2.3.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5139184..3d0460f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ jspc-maven-plugin -2.3.1-SNAPSHOT +2.3.2 maven-plugin Apache Sling JSPC Maven Plugin @@ -39,7 +39,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git scm:git:https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git https://gitbox.apache.org/repos/asf?p=sling-jspc-maven-plugin.git - HEAD + jspc-maven-plugin-2.3.2
[sling-scriptingbundle-maven-plugin] 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-scriptingbundle-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 75d7a1e [maven-release-plugin] prepare for next development iteration
75d7a1e is described below
commit 75d7a1ee74cdc3acca1167cd678dcf13a2bca13c
Author: Karl Pauls
AuthorDate: Thu Dec 16 15:04:46 2021 +0100
[maven-release-plugin] prepare for next development iteration
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 23d1f48..5d351dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
4.0.0
scriptingbundle-maven-plugin
-0.5.2
+0.5.3-SNAPSHOT
maven-plugin
Apache Sling Scripting Bundle Maven Plugin
@@ -41,7 +41,7 @@
scm:git:https://gitbox.apache.org/repos/asf/sling-scriptingbundle-maven-plugin.git
scm:git:https://gitbox.apache.org/repos/asf/sling-scriptingbundle-maven-plugin.git
https://github.com/apache/sling-scriptingbundle-maven-plugin/tree/${project.scm.tag}
-scriptingbundle-maven-plugin-0.5.2
+HEAD
@@ -49,7 +49,7 @@
3.6.0
12344664,12347157,12348422,12350010,12350474,12350606
${project.artifactId}-archives/${project.artifactId}-LATEST
-
2021-12-16T14:04:21Z
+
2021-12-16T14:04:46Z
apache/sling-scriptingbundle-maven-plugin
[sling-scriptingbundle-maven-plugin] annotated tag scriptingbundle-maven-plugin-0.5.2 created (now c9ec159)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag scriptingbundle-maven-plugin-0.5.2 in repository https://gitbox.apache.org/repos/asf/sling-scriptingbundle-maven-plugin.git. at c9ec159 (tag) tagging 8d15bd3974ade6025c5cc10f08e0fb8ca694fad0 (commit) replaces scriptingbundle-maven-plugin-0.5.0 by Karl Pauls on Thu Dec 16 15:04:43 2021 +0100 - Log - [maven-release-plugin] copy for tag scriptingbundle-maven-plugin-0.5.2 --- No new revisions were added by this update.
[sling-scriptingbundle-maven-plugin] branch master updated: [maven-release-plugin] prepare release scriptingbundle-maven-plugin-0.5.2
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-scriptingbundle-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 8d15bd3 [maven-release-plugin] prepare release
scriptingbundle-maven-plugin-0.5.2
8d15bd3 is described below
commit 8d15bd3974ade6025c5cc10f08e0fb8ca694fad0
Author: Karl Pauls
AuthorDate: Thu Dec 16 15:04:38 2021 +0100
[maven-release-plugin] prepare release scriptingbundle-maven-plugin-0.5.2
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3a2bdaf..23d1f48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
4.0.0
scriptingbundle-maven-plugin
-0.5.1-SNAPSHOT
+0.5.2
maven-plugin
Apache Sling Scripting Bundle Maven Plugin
@@ -41,7 +41,7 @@
scm:git:https://gitbox.apache.org/repos/asf/sling-scriptingbundle-maven-plugin.git
scm:git:https://gitbox.apache.org/repos/asf/sling-scriptingbundle-maven-plugin.git
https://github.com/apache/sling-scriptingbundle-maven-plugin/tree/${project.scm.tag}
-HEAD
+scriptingbundle-maven-plugin-0.5.2
@@ -49,7 +49,7 @@
3.6.0
12344664,12347157,12348422,12350010,12350474,12350606
${project.artifactId}-archives/${project.artifactId}-LATEST
-
2021-09-21T18:13:30Z
+
2021-12-16T14:04:21Z
apache/sling-scriptingbundle-maven-plugin
[sling-org-apache-sling-scripting-core] 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-scripting-core.git The following commit(s) were added to refs/heads/master by this push: new 8727cc7 [maven-release-plugin] prepare for next development iteration 8727cc7 is described below commit 8727cc70a8d2cd3f55c5bc712e435cc0435c6b91 Author: Karl Pauls AuthorDate: Thu Dec 16 15:01:00 2021 +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 25b742c..b01e9c6 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.scripting.core -2.4.2 +2.4.3-SNAPSHOT Apache Sling Scripting Core @@ -44,7 +44,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-scripting-core.git - org.apache.sling.scripting.core-2.4.2 + HEAD
[sling-org-apache-sling-scripting-core] annotated tag org.apache.sling.scripting.core-2.4.2 created (now c560273)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag org.apache.sling.scripting.core-2.4.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git. at c560273 (tag) tagging 65e80069b8e5ab16d1954fdd927136aeaf375fb9 (commit) replaces org.apache.sling.scripting.core-2.4.0 by Karl Pauls on Thu Dec 16 15:00:57 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.sling.scripting.core-2.4.2 --- No new revisions were added by this update.
[sling-org-apache-sling-scripting-core] branch master updated: [maven-release-plugin] prepare release org.apache.sling.scripting.core-2.4.2
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-scripting-core.git The following commit(s) were added to refs/heads/master by this push: new 65e8006 [maven-release-plugin] prepare release org.apache.sling.scripting.core-2.4.2 65e8006 is described below commit 65e80069b8e5ab16d1954fdd927136aeaf375fb9 Author: Karl Pauls AuthorDate: Thu Dec 16 15:00:53 2021 +0100 [maven-release-plugin] prepare release org.apache.sling.scripting.core-2.4.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4c654cf..25b742c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.scripting.core -2.4.1-SNAPSHOT +2.4.2 Apache Sling Scripting Core @@ -44,7 +44,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-scripting-core.git - HEAD + org.apache.sling.scripting.core-2.4.2
[sling-org-apache-sling-servlets-resolver] 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-resolver.git The following commit(s) were added to refs/heads/master by this push: new 5576255 [maven-release-plugin] prepare for next development iteration 5576255 is described below commit 55762552d2452f1a1286d826a982d455fe072e36 Author: Karl Pauls AuthorDate: Thu Dec 16 14:58:43 2021 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c2ccf3b..bab7600 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.servlets.resolver -2.9.2 +2.9.3-SNAPSHOT Apache Sling Servlets Resolver @@ -39,11 +39,11 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-servlets-resolver.git - org.apache.sling.servlets.resolver-2.9.2 + HEAD - 2021-12-16T13:58:03Z + 2021-12-16T13:58:43Z 12314292 4.13.3
[sling-org-apache-sling-servlets-resolver] annotated tag org.apache.sling.servlets.resolver-2.9.2 created (now a0f755b)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag org.apache.sling.servlets.resolver-2.9.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git. at a0f755b (tag) tagging c56c9e38909aba1583a245299549df457e6cc146 (commit) replaces org.apache.sling.servlets.resolver-2.9.0 by Karl Pauls on Thu Dec 16 14:58:38 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.sling.servlets.resolver-2.9.2 --- No new revisions were added by this update.
[sling-org-apache-sling-servlets-resolver] branch master updated: [maven-release-plugin] prepare release org.apache.sling.servlets.resolver-2.9.2
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-resolver.git The following commit(s) were added to refs/heads/master by this push: new c56c9e3 [maven-release-plugin] prepare release org.apache.sling.servlets.resolver-2.9.2 c56c9e3 is described below commit c56c9e38909aba1583a245299549df457e6cc146 Author: Karl Pauls AuthorDate: Thu Dec 16 14:58:34 2021 +0100 [maven-release-plugin] prepare release org.apache.sling.servlets.resolver-2.9.2 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 50af9fe..c2ccf3b 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.sling.servlets.resolver -2.9.1-SNAPSHOT +2.9.2 Apache Sling Servlets Resolver @@ -39,11 +39,11 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-servlets-resolver.git - HEAD + org.apache.sling.servlets.resolver-2.9.2 - 2021-11-09T09:13:25Z + 2021-12-16T13:58:03Z 12314292 4.13.3
[sling-org-apache-sling-launchpad-base] branch master updated: [maven-release-plugin] prepare release org.apache.sling.launchpad.base-7.0.3-2.7.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-launchpad-base.git The following commit(s) were added to refs/heads/master by this push: new 08af10e [maven-release-plugin] prepare release org.apache.sling.launchpad.base-7.0.3-2.7.6 08af10e is described below commit 08af10eef92208debaa7053cc7fc8c90647beb92 Author: Karl Pauls AuthorDate: Thu Dec 16 14:56:46 2021 +0100 [maven-release-plugin] prepare release org.apache.sling.launchpad.base-7.0.3-2.7.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0ec7300..8159cf2 100644 --- a/pom.xml +++ b/pom.xml @@ -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. --> -7.0.3-2.7.5-SNAPSHOT +7.0.3-2.7.6 bundle Apache Sling Launchpad Base @@ -45,7 +45,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-launchpad-base.git -HEAD +org.apache.sling.launchpad.base-7.0.3-2.7.6
[sling-org-apache-sling-launchpad-base] annotated tag org.apache.sling.launchpad.base-7.0.3-2.7.6 created (now 07f4fe0)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag org.apache.sling.launchpad.base-7.0.3-2.7.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git. at 07f4fe0 (tag) tagging 08af10eef92208debaa7053cc7fc8c90647beb92 (commit) replaces org.apache.sling.launchpad.base-7.0.1-2.7.4 by Karl Pauls on Thu Dec 16 14:57:00 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.sling.launchpad.base-7.0.3-2.7.6 --- No new revisions were added by this update.
[sling-org-apache-sling-launchpad-base] 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-launchpad-base.git The following commit(s) were added to refs/heads/master by this push: new 5ec775a [maven-release-plugin] prepare for next development iteration 5ec775a is described below commit 5ec775a549d61201aeeace94c995320e81e877fa Author: Karl Pauls AuthorDate: Thu Dec 16 14:57:03 2021 +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 8159cf2..db3dc2a 100644 --- a/pom.xml +++ b/pom.xml @@ -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. --> -7.0.3-2.7.6 +7.0.3-2.7.7-SNAPSHOT bundle Apache Sling Launchpad Base @@ -45,7 +45,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-launchpad-base.git -org.apache.sling.launchpad.base-7.0.3-2.7.6 +HEAD
[sling-org-apache-sling-feature-cpconverter] branch master updated: Add failing unit test for missing dependency issue (#120)
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-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new edeee9f Add failing unit test for missing dependency issue (#120)
edeee9f is described below
commit edeee9f98e697570979c0bccf456e5e2c3f63f35
Author: Niek Raaijmakers
AuthorDate: Thu Dec 16 14:54:02 2021 +0100
Add failing unit test for missing dependency issue (#120)
Co-authored-by: Niek Raaijmakers
---
.../ContentPackage2FeatureModelConverterTest.java | 101 -
.../build_playground.ui.content-1.0-SNAPSHOT.zip | Bin 0 -> 17699035 bytes
2 files changed, 100 insertions(+), 1 deletion(-)
diff --git
a/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
b/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
index a16c332..f5f3843 100644
---
a/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
+++
b/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
@@ -34,6 +34,7 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.*;
import java.util.zip.ZipFile;
@@ -44,15 +45,18 @@ import javax.json.JsonObject;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.vault.fs.spi.PrivilegeDefinitions;
-import org.apache.jackrabbit.vault.packaging.CyclicDependencyException;
+import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.jackrabbit.vault.packaging.impl.PackageManagerImpl;
+import org.apache.jackrabbit.vault.packaging.impl.ZipVaultPackage;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Artifacts;
+import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Configuration;
import org.apache.sling.feature.Configurations;
import org.apache.sling.feature.Extension;
@@ -89,6 +93,8 @@ public class ContentPackage2FeatureModelConverterTest extends
AbstractConverterT
"test_b-1.0.zip",
"test_e-1.0.zip" };
+private static final String FORMAT =
"%1$s/%2$s/%3$s/%2$s-%3$s-cp2fm-converted.zip";
+
private ContentPackage2FeatureModelConverter converter;
private EntryHandlersManager handlersManager;
@@ -138,6 +144,97 @@ public class ContentPackage2FeatureModelConverterTest
extends AbstractConverterT
}
@Test
+public void checkIfGeneratedDependenciesAreProvided() throws Exception {
+URL packageUrl =
getClass().getResource("build_playground.ui.content-1.0-SNAPSHOT.zip");
+File packageFile = FileUtils.toFile(packageUrl);
+
+File outputDirectory = new File(System.getProperty("java.io.tmpdir"),
getClass().getName() + '_' + System.currentTimeMillis());
+File unreferencedOutputDir = new File(outputDirectory,
"mutable-content-packages");
+try {
+
+converter = new ContentPackage2FeatureModelConverter(false,
ContentPackage2FeatureModelConverter.SlingInitialContentPolicy.EXTRACT_AND_REMOVE)
+.setEntryHandlersManager(handlersManager)
+.setAclManager(new DefaultAclManager());
+
+converter.setFeaturesManager(new DefaultFeaturesManager(true, 5,
outputDirectory, null, null, new HashMap<>(), new DefaultAclManager()))
+.setBundlesDeployer(new
LocalMavenRepositoryArtifactsDeployer(outputDirectory))
+
.setEmitter(DefaultPackagesEventsEmitter.open(outputDirectory))
+
.setContentTypePackagePolicy(PackagePolicy.PUT_IN_DEDICATED_FOLDER)
+.setUnreferencedArtifactsDeployer(new
LocalMavenRepositoryArtifactsDeployer(unreferencedOutputDir))
+.convert(packageFile);
+
+
+File featureModel = new File(outputDirectory,
"playground.ui.content.json");
+Feature feature = FeatureJSONReader.read(new
FileReader(featureModel), "");
+
+List allPackageIds = new ArrayList<>();
+List contentRefsDependencies = new ArrayList<>()
[sling-org-apache-sling-feature-launcher] branch master updated: [maven-release-plugin] prepare release org.apache.sling.feature.launcher-1.1.28
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-feature-launcher.git The following commit(s) were added to refs/heads/master by this push: new e014d7f [maven-release-plugin] prepare release org.apache.sling.feature.launcher-1.1.28 e014d7f is described below commit e014d7fed06904f1106bbea837b6403bf40c9ee7 Author: Karl Pauls AuthorDate: Thu Dec 16 14:53:17 2021 +0100 [maven-release-plugin] prepare release org.apache.sling.feature.launcher-1.1.28 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f8007bc..2a71d1a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.sling.feature.launcher -1.1.27-SNAPSHOT +1.1.28 Apache Sling Feature Model Launcher @@ -40,7 +40,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-feature-launcher.git -HEAD +org.apache.sling.feature.launcher-1.1.28 @@ -264,7 +264,7 @@ org.apache.sling org.apache.sling.commons.johnzon -1.2.13-SNAPSHOT +1.2.14 provided
[sling-org-apache-sling-feature-launcher] 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-feature-launcher.git The following commit(s) were added to refs/heads/master by this push: new dad46fb [maven-release-plugin] prepare for next development iteration dad46fb is described below commit dad46fbca697fc88fa77e229b9a0f25e7eb5628b Author: Karl Pauls AuthorDate: Thu Dec 16 14:53:25 2021 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2a71d1a..92fcae3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.sling.feature.launcher -1.1.28 +1.1.29-SNAPSHOT Apache Sling Feature Model Launcher @@ -40,7 +40,7 @@ scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-feature-launcher.git -org.apache.sling.feature.launcher-1.1.28 +HEAD @@ -264,7 +264,7 @@ org.apache.sling org.apache.sling.commons.johnzon -1.2.14 +1.2.13-SNAPSHOT provided
[sling-org-apache-sling-feature-launcher] annotated tag org.apache.sling.feature.launcher-1.1.28 created (now ee8d64d)
This is an automated email from the ASF dual-hosted git repository. pauls pushed a change to annotated tag org.apache.sling.feature.launcher-1.1.28 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git. at ee8d64d (tag) tagging e014d7fed06904f1106bbea837b6403bf40c9ee7 (commit) replaces org.apache.sling.feature.launcher-1.1.26 by Karl Pauls on Thu Dec 16 14:53:21 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.sling.feature.launcher-1.1.28 --- No new revisions were added by this update.
