You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/02/20 18:25:18 UTC
svn commit: r1824897 - in /jackrabbit/trunk:
jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/
jackrabbit-parent/
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/
jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav...
Author: reschke
Date: Tue Feb 20 18:25:18 2018
New Revision: 1824897
URL: http://svn.apache.org/viewvc?rev=1824897&view=rev
Log:
JCR-4266: Update servlet-api to 2.5
Modified:
jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/BasicCredentialsProviderTest.java
jackrabbit/trunk/jackrabbit-parent/pom.xml
jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java
jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java
jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java
Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/BasicCredentialsProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/BasicCredentialsProviderTest.java?rev=1824897&r1=1824896&r2=1824897&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/BasicCredentialsProviderTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/BasicCredentialsProviderTest.java Tue Feb 20 18:25:18 2018
@@ -296,5 +296,21 @@ public class BasicCredentialsProviderTes
public String getRealPath(String path) {
return null;
}
+
+ public int getRemotePort() {
+ return 0;
+ }
+
+ public String getLocalName() {
+ return null;
+ }
+
+ public String getLocalAddr() {
+ return null;
+ }
+
+ public int getLocalPort() {
+ return 0;
+ }
}
}
Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1824897&r1=1824896&r2=1824897&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Tue Feb 20 18:25:18 2018
@@ -531,7 +531,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java?rev=1824897&r1=1824896&r2=1824897&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java Tue Feb 20 18:25:18 2018
@@ -1014,4 +1014,20 @@ public class WebdavRequestImpl implement
public String getRealPath(String s) {
return httpRequest.getRealPath(s);
}
+
+ public int getRemotePort() {
+ return httpRequest.getRemotePort();
+ }
+
+ public String getLocalName() {
+ return httpRequest.getLocalName();
+ }
+
+ public String getLocalAddr() {
+ return httpRequest.getLocalAddr();
+ }
+
+ public int getLocalPort() {
+ return httpRequest.getLocalPort();
+ }
}
Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java?rev=1824897&r1=1824896&r2=1824897&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java Tue Feb 20 18:25:18 2018
@@ -311,4 +311,12 @@ public class WebdavResponseImpl implemen
public Locale getLocale() {
return httpResponse.getLocale();
}
+
+ public String getContentType() {
+ return httpResponse.getContentType();
+ }
+
+ public void setCharacterEncoding(String charset) {
+ httpResponse.setCharacterEncoding(charset);
+ }
}
Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java?rev=1824897&r1=1824896&r2=1824897&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java Tue Feb 20 18:25:18 2018
@@ -14,5 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@org.osgi.annotation.versioning.Version("1.1.0")
+@org.osgi.annotation.versioning.Version("1.2.0")
package org.apache.jackrabbit.webdav;
Modified: jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java?rev=1824897&r1=1824896&r2=1824897&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java Tue Feb 20 18:25:18 2018
@@ -40,6 +40,13 @@ public class OutputContextImplTest exten
public void setHeader(String name, String value) {
assertTrue(Long.parseLong(value) > Integer.MAX_VALUE);
}
+ @Override
+ public String getContentType() {
+ return null;
+ }
+ @Override
+ public void setCharacterEncoding(String charset) {
+ }
};
OutputContext ctx = new OutputContextImpl(response, null);
Modified: jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java?rev=1824897&r1=1824896&r2=1824897&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java Tue Feb 20 18:25:18 2018
@@ -343,5 +343,17 @@ public class CSRFUtilTest extends TestCa
public String getRealPath(String path) {
return null;
}
+ public int getRemotePort() {
+ return 0;
+ }
+ public String getLocalName() {
+ return null;
+ }
+ public String getLocalAddr() {
+ return null;
+ }
+ public int getLocalPort() {
+ return 0;
+ }
}
}
\ No newline at end of file