SLING-10917: fix an off by one in filter excludes for content.xml
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtils.java b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtils.java
index 02db88b..fed02fc 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtils.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtils.java
@@ -150,7 +150,7 @@
if (s.startsWith(ENTRY_ROOT_PATH)) {
String path = PlatformNameFormat.getRepositoryPath(s.substring(ENTRY_ROOT_PATH.length()));
if (path.endsWith(Constants.DOT_CONTENT_XML)) {
- path = path.substring(0, path.lastIndexOf(Constants.DOT_CONTENT_XML));
+ path = path.substring(0, path.lastIndexOf(Constants.DOT_CONTENT_XML)-1);
} else if (path.endsWith(".xml")) {
// remove .xml extension from policy-nodes
path = path.substring(0, path.lastIndexOf(".xml"));
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtilsTest.java b/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtilsTest.java
new file mode 100644
index 0000000..470ee85
--- /dev/null
+++ b/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtilsTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.cpconverter.vltpkg;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class VaultPackageUtilsTest {
+
+ @Test
+ public void testToRepositoryPath() {
+ assertEquals("/", VaultPackageUtils.toRepositoryPath("/"));
+ assertEquals("/test/content", VaultPackageUtils.toRepositoryPath("/test/content"));
+ assertEquals("/test.xml", VaultPackageUtils.toRepositoryPath("/test.xml"));
+ assertEquals("/test/.content.xml", VaultPackageUtils.toRepositoryPath("/test/.content.xml"));
+
+ // paths starting with /jcr_root
+ assertEquals("/", VaultPackageUtils.toRepositoryPath("/jcr_root"));
+ assertEquals("/test/content", VaultPackageUtils.toRepositoryPath("/jcr_root/test/content"));
+ assertEquals("/test", VaultPackageUtils.toRepositoryPath("/jcr_root/test.xml"));
+ assertEquals("/test", VaultPackageUtils.toRepositoryPath("/jcr_root/test/.content.xml"));
+ }
+}
