Repository: wicket Updated Branches: refs/heads/master dd1d6c6c5 -> baaeb3278
Move the Apache license test for wicket-util from src/main to src/test Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/baaeb327 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/baaeb327 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/baaeb327 Branch: refs/heads/master Commit: baaeb327815dc34c0b7228b4cf1f55f396f74163 Parents: dd1d6c6 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Nov 3 14:44:43 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Nov 3 14:44:43 2014 +0200 ---------------------------------------------------------------------- .../util/license/ApacheLicenceHeaderTest.java | 82 -------------------- .../license/ApacheLicenseHeaderTestCase.java | 5 -- .../util/license/ApacheLicenceHeaderTest.java | 76 ++++++++++++++++++ 3 files changed, 76 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/baaeb327/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 4e09e19..0000000 --- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,82 +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.wicket.util.license; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - - /* - * See NOTICE.txt - */ - htmlIgnore.add("src/main/java/org/apache/wicket/util/diff"); - - xmlPrologIgnore.add("src/main/java/org/apache/wicket/util/diff"); - - /* - * ASL1.1. Taken from Maven JRCS. See NOTICE.txt - */ - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/AddDelta.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/ChangeDelta.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Chunk.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DeleteDelta.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Delta.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Diff.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DifferentiationFailedException.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DiffException.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/PatchFailedException.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Revision.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/RevisionVisitor.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/ToString.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/PathNode.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/Snake.java"); - /* - * Needs to be resolved (rewritten or NOTICE) - */ - javaIgnore.add("src/main/java/org/apache/wicket/util/concurrent/ConcurrentReaderHashMap.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/concurrent/ConcurrentHashMap.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/concurrent/CopyOnWriteArrayList.java"); - - javaScriptIgnore.add("src/site/xdoc/onestat.js"); - - /* - * .js in test is very test specific and a license header would confuse and make it unclear - * what the test is about. - */ - javaScriptIgnore.add("src/test/java"); - - /* - * See NOTICE.txt - */ - javaScriptIgnore.add("src/main/java/org/apache/wicket/ajax/wicket-ajax-debug-drag.js"); - javaScriptIgnore.add("src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js"); - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/baaeb327/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java index 45271c8..be04817 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java @@ -58,11 +58,6 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert private final List<String> suffixes; private final List<String> ignoreFiles; - private SuffixAndIgnoreFileFilter(final List<String> suffixes) - { - this(suffixes, null); - } - private SuffixAndIgnoreFileFilter(final List<String> suffixes, final List<String> ignoreFiles) { http://git-wip-us.apache.org/repos/asf/wicket/blob/baaeb327/wicket-util/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java new file mode 100644 index 0000000..0a243c0 --- /dev/null +++ b/wicket-util/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java @@ -0,0 +1,76 @@ +/* + * 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.wicket.util.license; + +/** + * Test that the license headers are in place in this project. The tests are run from + * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. + * + * @author Frank Bille Jensen (frankbille) + */ +public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase +{ + /** + * Construct. + */ + public ApacheLicenceHeaderTest() + { + // addHeaders = true; + + /* + * See NOTICE.txt + */ + htmlIgnore.add("src/main/java/org/apache/wicket/util/diff"); + + xmlPrologIgnore.add("src/main/java/org/apache/wicket/util/diff"); + + /* + * ASL1.1. Taken from Maven JRCS. See NOTICE.txt + */ + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/AddDelta.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/ChangeDelta.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Chunk.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DeleteDelta.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Delta.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Diff.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DifferentiationFailedException.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DiffException.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/PatchFailedException.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Revision.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/RevisionVisitor.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/ToString.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/PathNode.java"); + javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/Snake.java"); + + javaScriptIgnore.add("src/site/xdoc/onestat.js"); + + /* + * .js in test is very test specific and a license header would confuse and make it unclear + * what the test is about. + */ + javaScriptIgnore.add("src/test/java"); + + /* + * See NOTICE.txt + */ + javaScriptIgnore.add("src/main/java/org/apache/wicket/ajax/wicket-ajax-debug-drag.js"); + javaScriptIgnore.add("src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js"); + } +}
