You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2021/11/12 13:40:28 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
Revert "SLINGd-10917: fix an off by one in filter excludes for content.xml"
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 f51d508 Revert "SLINGd-10917: fix an off by one in filter excludes for content.xml"
f51d508 is described below
commit f51d508ffafd7a32912947938e1455f28eff65d7
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Fri Nov 12 14:38:20 2021 +0100
Revert "SLINGd-10917: fix an off by one in filter excludes for content.xml"
This reverts commit f48956ded842231ae028205afd883de1c6c39c26.
---
.../cpconverter/vltpkg/VaultPackageUtils.java | 2 +-
.../cpconverter/vltpkg/VaultPackageUtilsTest.java | 38 ----------------------
2 files changed, 1 insertion(+), 39 deletions(-)
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 fed02fc..02db88b 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 @@ public class VaultPackageUtils {
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)-1);
+ path = path.substring(0, path.lastIndexOf(Constants.DOT_CONTENT_XML));
} 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
deleted file mode 100644
index 470ee85..0000000
--- a/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtilsTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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"));
- }
-}