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/07 11:42:22 UTC
[1/24] git commit: Merge branch 'sandbox/wicket4439' of
https://git-wip-us.apache.org/repos/asf/wicket into sandbox/wicket4439
Updated Branches:
refs/heads/sandbox/wicket4439 53f078731 -> e3e445b62
Merge branch 'sandbox/wicket4439' of https://git-wip-us.apache.org/repos/asf/wicket into sandbox/wicket4439
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e3e445b6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e3e445b6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e3e445b6
Branch: refs/heads/sandbox/wicket4439
Commit: e3e445b629286011eb4c0788f5d7a193d2528cf0
Parents: 6498d3c 53f0787
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 7 12:38:28 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 7 12:38:28 2012 +0200
----------------------------------------------------------------------
.../wicket/osgi/OsgiClashingPackagesTest.java | 4 ++++
.../resource/AbstractResourceStreamWriter.java | 7 ++++---
.../resource/locator/ResourceStreamLocator.java | 2 --
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e3e445b6/testing/common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
----------------------------------------------------------------------
diff --cc testing/common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
index 90e5e35,5e9cefe..46f1a9e
--- a/testing/common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
+++ b/testing/common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
@@@ -64,24 -63,10 +64,28 @@@ public class OsgiClashingPackagesTest e
private void fail(Entry<String, List<Project>> entry) {
StringBuilder builder = new StringBuilder();
- builder.append("Package '").append(entry.getKey()).append("' has classes in two or more modules: ");
++
+ String packageName = entry.getKey();
+ builder.append("Package '").append(packageName).append("' has files in two or more modules: ");
++
for (Project conflict : entry.getValue()) {
builder.append(conflict.getName()).append(", ");
}
++
+ try
+ {
+ builder.append("\nResources:\n");
+ Enumeration<URL> resources = getClass().getClassLoader().getResources(packageName);
+ while (resources.hasMoreElements())
+ {
+ URL resource = resources.nextElement();
+ builder.append("\n\t").append(resource.toExternalForm());
+ }
+ } catch (IOException e)
+ {
+ e.printStackTrace();
+ }
++
fail(builder.toString());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e3e445b6/wicket-core/src/main/java/org/apache/wicket/core/util/resource/AbstractResourceStreamWriter.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/core/util/resource/AbstractResourceStreamWriter.java
index 7971b74,1792af6..c45d196
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/AbstractResourceStreamWriter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/AbstractResourceStreamWriter.java
@@@ -26,9 -26,9 +26,10 @@@ import org.apache.wicket.util.time.Time
/**
* Base implementation of an IResourceStreamWriter so that you only have to override the
-- * {@link IResourceStreamWriter#write(java.io.OutputStream)} Don't forget to overwrite the
-- * {@link IResourceStream#length()} method if you do know the total length that will be generated.
- *
++ * {@link IResourceStreamWriter#write(org.apache.wicket.request.Response)}. Don't forget to overwrite the
++ * {@link org.apache.wicket.util.resource.IResourceStream#length()} method if you do know the total
++ * length that will be generated.
+ *
* @see IResourceStreamWriter
*/
public abstract class AbstractResourceStreamWriter implements IResourceStreamWriter
http://git-wip-us.apache.org/repos/asf/wicket/blob/e3e445b6/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
index 7e614b7,2b0b5d0..b666869
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
@@@ -113,7 -113,7 +113,6 @@@ public class ResourceStreamLocator impl
}
/**
- *
- *
* @see org.apache.wicket.core.util.resource.locator.IResourceStreamLocator#locate(java.lang.Class,
* java.lang.String, java.lang.String, java.lang.String, java.util.Locale,
* java.lang.String, boolean)
@@@ -247,7 -247,7 +246,6 @@@
}
/**
- *
- *
* @see org.apache.wicket.core.util.resource.locator.IResourceStreamLocator#newResourceNameIterator(java.lang.String,
* java.util.Locale, java.lang.String, java.lang.String, java.lang.String, boolean)
*/