You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/05/16 16:21:49 UTC
svn commit: r1595209 - in /sling/trunk/tooling/ide:
api-test/src/test/java/org/apache/sling/ide/filter/
api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java
api/src/org/apache/sling/ide/filter/IgnoredResources.java
Author: rombert
Date: Fri May 16 14:21:49 2014
New Revision: 1595209
URL: http://svn.apache.org/r1595209
Log:
SLING-3161 - SlingIDE Import Content wizard should respect .vltignore
files
Add an IgnoredResources abstraction in the api project.
Added:
sling/trunk/tooling/ide/api-test/src/test/java/org/apache/sling/ide/filter/
sling/trunk/tooling/ide/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java (with props)
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/IgnoredResources.java (with props)
Added: sling/trunk/tooling/ide/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java?rev=1595209&view=auto
==============================================================================
--- sling/trunk/tooling/ide/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java (added)
+++ sling/trunk/tooling/ide/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java Fri May 16 14:21:49 2014
@@ -0,0 +1,72 @@
+/*
+ * 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.ide.filter;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class IgnoredResourcesTest {
+
+ @Test
+ public void nameMatches() {
+
+ IgnoredResources r = new IgnoredResources();
+ r.registerRegExpIgnoreRule("/content", "en");
+
+ assertThat(r.isIgnored("/content/en"), equalTo(true));
+ }
+
+ @Test
+ public void wildCardMatches() {
+
+ IgnoredResources r = new IgnoredResources();
+ r.registerRegExpIgnoreRule("/content", "*sync");
+
+ assertThat(r.isIgnored("/content/contentsync"), equalTo(true));
+ assertThat(r.isIgnored("/content/content"), equalTo(false));
+ }
+
+ @Test
+ public void commentLinesAreIgnored() {
+
+ IgnoredResources r = new IgnoredResources();
+ r.registerRegExpIgnoreRule("/content", "#en");
+
+ assertThat(r.isIgnored("/content/#en"), equalTo(false));
+ }
+
+ @Test
+ public void dotsAreEscaped() {
+
+ IgnoredResources r = new IgnoredResources();
+ r.registerRegExpIgnoreRule("/content", "en.html");
+
+ assertThat(r.isIgnored("/content/en.html"), equalTo(true));
+ assertThat(r.isIgnored("/content/en-html"), equalTo(false));
+ }
+
+ @Test
+ public void questionMarksAreEscaped() {
+
+ IgnoredResources r = new IgnoredResources();
+ r.registerRegExpIgnoreRule("/content", "?en");
+
+ assertThat(r.isIgnored("/content/zen"), equalTo(true));
+ }
+}
Propchange: sling/trunk/tooling/ide/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/tooling/ide/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Added: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/IgnoredResources.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/IgnoredResources.java?rev=1595209&view=auto
==============================================================================
--- sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/IgnoredResources.java (added)
+++ sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/IgnoredResources.java Fri May 16 14:21:49 2014
@@ -0,0 +1,63 @@
+/*
+ * 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.ide.filter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * The <tt>IgnoredResources</tt> holds information about what resources are ignored in a local checkout
+ */
+public class IgnoredResources {
+
+ private List<Pattern> patterns = new ArrayList<Pattern>();
+
+ public void registerRegExpIgnoreRule(String root, String pattern) {
+
+ // copied from org.apache.jackrabbit.vault.vlt.meta.Ignored
+ if (pattern.startsWith("#")) {
+ return;
+ }
+ StringBuilder reg = new StringBuilder("^");
+ reg.append(root).append("/");
+ for (int i = 0; i < pattern.length(); i++) {
+ char c = pattern.charAt(i);
+ if (c == '*') {
+ reg.append(".*");
+ } else if (c == '?') {
+ reg.append(".");
+ } else if (c == '.') {
+ reg.append("\\.");
+ } else {
+ reg.append(c);
+ }
+ }
+ reg.append("$");
+
+ patterns.add(Pattern.compile(reg.toString()));
+ }
+
+ public boolean isIgnored(String repositoryPath) {
+ for (Pattern pattern : patterns) {
+ if (pattern.matcher(repositoryPath).matches()) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Propchange: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/IgnoredResources.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/IgnoredResources.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL