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 2017/04/12 20:16:35 UTC
[1/7] wicket git commit: [WICKET-6355] It is now possible to set
fileName to FileSystemResource
Repository: wicket
Updated Branches:
refs/heads/master 89b1cb163 -> 3734a1a0b
[WICKET-6355] It is now possible to set fileName to FileSystemResource
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/71d5be39
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/71d5be39
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/71d5be39
Branch: refs/heads/master
Commit: 71d5be39df87875d3550a05f44df8ba3e6659036
Parents: 89b1cb1
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Apr 12 15:44:16 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Apr 12 15:44:16 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/wicket/resource/FileSystemResource.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/71d5be39/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
index b4b270e..77268ad 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
@@ -68,7 +68,7 @@ public class FileSystemResource extends AbstractResource
@Override
protected ResourceResponse newResourceResponse(Attributes attributes)
{
- return createResourceResponse(path);
+ return createResourceResponse(path, null);
}
/**
@@ -76,9 +76,11 @@ public class FileSystemResource extends AbstractResource
*
* @param path
* the path to create the resource response with
+ * @param fileName
+ * fileName to set, path.getFileName() will be used in case null passed
* @return the actual resource response x
*/
- protected ResourceResponse createResourceResponse(Path path)
+ protected ResourceResponse createResourceResponse(Path path, String fileName)
{
try
{
@@ -93,6 +95,7 @@ public class FileSystemResource extends AbstractResource
resourceResponse.setContentType(getMimeType());
resourceResponse.setAcceptRange(ContentRangeType.BYTES);
resourceResponse.setContentLength(size);
+ resourceResponse.setFileName(fileName == null ? path.getFileName().toString() : fileName);
RequestCycle cycle = RequestCycle.get();
Long startbyte = cycle.getMetaData(CONTENT_RANGE_STARTBYTE);
Long endbyte = cycle.getMetaData(CONTENT_RANGE_ENDBYTE);
[2/7] wicket git commit: [WICKET-6355] code modified according to
@martin-g comments
Posted by mg...@apache.org.
[WICKET-6355] code modified according to @martin-g comments
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3de67f3e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3de67f3e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3de67f3e
Branch: refs/heads/master
Commit: 3de67f3e7323b02c9d505b88ba10aa7a72fe65dc
Parents: 71d5be3
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Apr 12 16:22:54 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Apr 12 16:22:54 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/wicket/resource/FileSystemResource.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3de67f3e/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
index 77268ad..1ac46c3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
@@ -68,7 +68,7 @@ public class FileSystemResource extends AbstractResource
@Override
protected ResourceResponse newResourceResponse(Attributes attributes)
{
- return createResourceResponse(path, null);
+ return createResourceResponse(attributes, path);
}
/**
@@ -80,7 +80,7 @@ public class FileSystemResource extends AbstractResource
* fileName to set, path.getFileName() will be used in case null passed
* @return the actual resource response x
*/
- protected ResourceResponse createResourceResponse(Path path, String fileName)
+ protected ResourceResponse createResourceResponse(Attributes attributes, Path path)
{
try
{
@@ -95,7 +95,9 @@ public class FileSystemResource extends AbstractResource
resourceResponse.setContentType(getMimeType());
resourceResponse.setAcceptRange(ContentRangeType.BYTES);
resourceResponse.setContentLength(size);
- resourceResponse.setFileName(fileName == null ? path.getFileName().toString() : fileName);
+ if (path != null && path.getFileName() != null) {
+ resourceResponse.setFileName(path.getFileName().toString());
+ }
RequestCycle cycle = RequestCycle.get();
Long startbyte = cycle.getMetaData(CONTENT_RANGE_STARTBYTE);
Long endbyte = cycle.getMetaData(CONTENT_RANGE_ENDBYTE);
[3/7] wicket git commit: [WICKET-6355] code modified according to
@klopfdreh comments
Posted by mg...@apache.org.
[WICKET-6355] code modified according to @klopfdreh comments
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aa27df46
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aa27df46
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aa27df46
Branch: refs/heads/master
Commit: aa27df462fb5ccdd6dd211528edf48e3f13e740c
Parents: 3de67f3
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Apr 12 19:03:35 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Apr 12 19:03:35 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/wicket/resource/FileSystemResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/aa27df46/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
index 1ac46c3..7d00cc2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
@@ -95,7 +95,7 @@ public class FileSystemResource extends AbstractResource
resourceResponse.setContentType(getMimeType());
resourceResponse.setAcceptRange(ContentRangeType.BYTES);
resourceResponse.setContentLength(size);
- if (path != null && path.getFileName() != null) {
+ if (path.getFileName() != null) {
resourceResponse.setFileName(path.getFileName().toString());
}
RequestCycle cycle = RequestCycle.get();
[7/7] wicket git commit: Merge branch 'pr-219-master'
Posted by mg...@apache.org.
Merge branch 'pr-219-master'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3734a1a0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3734a1a0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3734a1a0
Branch: refs/heads/master
Commit: 3734a1a0b6624bdc72cb31c900e15984283fb1d9
Parents: 5289eb5 c8bae78
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 12 22:16:23 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 12 22:16:23 2017 +0200
----------------------------------------------------------------------
.../org/apache/wicket/resource/FileSystemResource.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[4/7] wicket git commit: Upgrade Log4j2 to 2.8.2 and Mockito to 2.7.22
Posted by mg...@apache.org.
Upgrade Log4j2 to 2.8.2 and Mockito to 2.7.22
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5289eb54
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5289eb54
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5289eb54
Branch: refs/heads/master
Commit: 5289eb54babbe2cc93c2f1bb9e8b0a1c958dab34
Parents: 89b1cb1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 12 22:10:19 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 12 22:10:19 2017 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5289eb54/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ec9a8e..232a3ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,9 +136,9 @@
<servlet-api.version>3.1.0</servlet-api.version>
<maven.javadoc.version>2.10.4</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version>
- <mockito.version>2.7.21</mockito.version>
+ <mockito.version>2.7.22</mockito.version>
<slf4j.version>1.7.25</slf4j.version>
- <log4j.version>2.8.1</log4j.version>
+ <log4j.version>2.8.2</log4j.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
<objenesis.version>2.5.1</objenesis.version>
<aspectj.version>1.8.10</aspectj.version>
[6/7] wicket git commit: WICKET-6355 Pass the request attributes to
FileSystemResource#createResourceResponse()
Posted by mg...@apache.org.
WICKET-6355 Pass the request attributes to FileSystemResource#createResourceResponse()
Fix the javadoc of #createResourceResponse()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c8bae78a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c8bae78a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c8bae78a
Branch: refs/heads/master
Commit: c8bae78aac6abcff925b526772d488e37b790faf
Parents: efc700f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 12 22:15:45 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 12 22:15:45 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/resource/FileSystemResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c8bae78a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
index 7d00cc2..ee72113 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java
@@ -76,9 +76,9 @@ public class FileSystemResource extends AbstractResource
*
* @param path
* the path to create the resource response with
- * @param fileName
- * fileName to set, path.getFileName() will be used in case null passed
- * @return the actual resource response x
+ * @param attributes
+ * request attributes
+ * @return the actual resource response
*/
protected ResourceResponse createResourceResponse(Attributes attributes, Path path)
{
[5/7] wicket git commit: Upgrade Log4j2 to 2.8.2 and Mockito to 2.7.22
Posted by mg...@apache.org.
Upgrade Log4j2 to 2.8.2 and Mockito to 2.7.22
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/efc700f4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/efc700f4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/efc700f4
Branch: refs/heads/master
Commit: efc700f41a84d30c5a3bee7c28c39a65825206ce
Parents: aa27df4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 12 22:10:19 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 12 22:10:48 2017 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/efc700f4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ec9a8e..232a3ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,9 +136,9 @@
<servlet-api.version>3.1.0</servlet-api.version>
<maven.javadoc.version>2.10.4</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version>
- <mockito.version>2.7.21</mockito.version>
+ <mockito.version>2.7.22</mockito.version>
<slf4j.version>1.7.25</slf4j.version>
- <log4j.version>2.8.1</log4j.version>
+ <log4j.version>2.8.2</log4j.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
<objenesis.version>2.5.1</objenesis.version>
<aspectj.version>1.8.10</aspectj.version>