You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/03/12 11:52:28 UTC
[1/2] git commit: WICKET-4439
Updated Branches:
refs/heads/master 8f476c6bb -> e5bcce1cc
WICKET-4439
Do not count folders. Just the resources inside the folders may cause problems
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e5bcce1c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e5bcce1c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e5bcce1c
Branch: refs/heads/master
Commit: e5bcce1cc6f1cc658dc9fdce5f287bdc5e5b850a
Parents: b177858
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 12 12:51:40 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 12 12:51:40 2012 +0200
----------------------------------------------------------------------
.../wicket/osgi/OsgiClashingPackagesTest.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e5bcce1c/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
index 90e5e35..8e335a6 100644
--- a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
+++ b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
@@ -146,6 +146,9 @@ public class OsgiClashingPackagesTest extends Assert
private boolean shouldCollect(final String entryName)
{
if (
+ // ignore folder names. count just files/resources
+ entryName.endsWith("/") ||
+
// all modules have META-INF {MANIFEST.MF, Maven stuff, ..}
entryName.startsWith("META-INF/") ||