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/30 21:36:16 UTC
[sling-org-apache-sling-feature-cpconverter] 20/29: Adjust
Converter to support bundles 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
commit 44b0e0231fb3f7079f3d2984f15b58e4c46ca8c6
Author: stripodi <st...@192.168.1.111>
AuthorDate: Fri Apr 26 14:55:00 2019 +0200
Adjust Converter to support bundles in /libs as well
---
.../sling/feature/cpconverter/handlers/BundleEntryHandler.java | 2 +-
.../sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
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 860a1a4..cc2c447 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/[^/]+/install(\\.([^/]+))?/.+\\.jar");
+ super("(jcr_root)?/(apps|libs)/[^/]+/install(\\.([^/]+))?/.+\\.jar");
}
@Override
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java b/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
index b6db188..fcd5162 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
@@ -67,6 +67,11 @@ public final class BundleEntryHandlerTest {
}
@Test
+ public void matchesOnLibsDir() {
+ assertTrue(bundleEntryHandler.matches(bundleLocation.replace("/apps/", "/libs/")));
+ }
+
+ @Test
public void deployBundle() throws Exception {
Archive archive = mock(Archive.class);
Entry entry = mock(Entry.class);