You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/04/26 15:45:24 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
Adjust Converter to support bundles and configuration in /libs as well
This is an automated email from the ASF dual-hosted git repository.
simonetripodi 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 9903bea Adjust Converter to support bundles and configuration in /libs as well
9903bea is described below
commit 9903beae183791ea1d7107e124743edb566a2d8e
Author: stripodi <st...@192.168.1.111>
AuthorDate: Fri Apr 26 17:45:17 2019 +0200
Adjust Converter to support bundles and configuration in /libs as well
---
.../feature/cpconverter/handlers/AbstractConfigurationEntryHandler.java | 2 +-
.../apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractConfigurationEntryHandler.java b/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractConfigurationEntryHandler.java
index 99ea954..6d6ed3b 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractConfigurationEntryHandler.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractConfigurationEntryHandler.java
@@ -27,7 +27,7 @@ import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter
abstract class AbstractConfigurationEntryHandler extends AbstractRegexEntryHandler {
public AbstractConfigurationEntryHandler(String extension) {
- super("(jcr_root)?/apps/[^/]+/config(\\.([^/]+))?/.+\\." + extension);
+ super("(jcr_root)?/(?:apps|libs)/.+/config(\\.([^/]+))?/.+\\." + extension);
}
@Override
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 098aec0..7a370b7 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
@@ -46,7 +46,7 @@ public final class BundleEntryHandler extends AbstractRegexEntryHandler {
private final Pattern pomPropertiesPattern = Pattern.compile("META-INF/maven/[^/]+/[^/]+/pom.properties");
public BundleEntryHandler() {
- super("(jcr_root)?/(?:apps|libs)/[^/]+/install(\\.([^/]+))?/.+\\.jar");
+ super("(jcr_root)?/(?:apps|libs)/.+/install(\\.([^/]+))?/.+\\.jar");
}
@Override