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 2016/12/15 14:22:27 UTC
svn commit: r1774468 [3/3] - in /jackrabbit/trunk/jackrabbit-spi2dav: ./
src/main/java/org/apache/jackrabbit/spi2dav/
src/main/java/org/apache/jackrabbit/spi2davex/
src/test/java/org/apache/jackrabbit/spi2dav/
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java?rev=1774468&r1=1774467&r2=1774468&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java Thu Dec 15 14:22:27 2016
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.spi2dav;
+import org.apache.http.HttpResponse;
import org.apache.jackrabbit.commons.webdav.JcrRemotingConstants;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
@@ -32,9 +33,8 @@ import org.apache.jackrabbit.webdav.DavE
import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.MultiStatus;
import org.apache.jackrabbit.webdav.MultiStatusResponse;
-import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
-import org.apache.jackrabbit.webdav.client.methods.ReportMethod;
+import org.apache.jackrabbit.webdav.client.methods.HttpPropfind;
+import org.apache.jackrabbit.webdav.client.methods.HttpReport;
import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
import org.apache.jackrabbit.webdav.property.DavPropertySet;
import org.apache.jackrabbit.webdav.version.report.ReportInfo;
@@ -117,14 +117,16 @@ class URIResolverImpl implements URIReso
ReportInfo rInfo = new ReportInfo(JcrRemotingConstants.REPORT_LOCATE_BY_UUID, ItemResourceConstants.NAMESPACE);
rInfo.setContentElement(DomUtil.hrefToXml(uniqueID, domFactory));
- ReportMethod rm = null;
+ HttpReport request = null;
try {
String wspUri = getWorkspaceUri(workspaceName);
- rm = new ReportMethod(wspUri, rInfo);
+ request = new HttpReport(wspUri, rInfo);
- service.getClient(sessionInfo).executeMethod(rm);
+ HttpResponse response = service.executeRequest(sessionInfo, request);
+ request.checkSuccess(response);
+
+ MultiStatus ms = request.getResponseBodyAsMultiStatus(response);
- MultiStatus ms = rm.getResponseBodyAsMultiStatus();
if (ms.getResponses().length == 1) {
String absoluteUri = resolve(wspUri, ms.getResponses()[0].getHref());
uriBuffer.append(absoluteUri);
@@ -138,8 +140,8 @@ class URIResolverImpl implements URIReso
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {
- if (rm != null) {
- rm.releaseConnection();
+ if (request != null) {
+ request.releaseConnection();
}
}
}
@@ -262,7 +264,7 @@ class URIResolverImpl implements URIReso
if (nodeIsGone) {
throw new RepositoryException("Can't reconstruct nodeId from URI when the remote node is gone.");
}
-
+
// retrieve parentId from cache or by recursive calls
NodeId parentId;
if (isSameURI(uri, getRootItemUri(sessionInfo.getWorkspaceName()))) {
@@ -276,12 +278,12 @@ class URIResolverImpl implements URIReso
nameSet.add(JcrRemotingConstants.JCR_UUID_LN, ItemResourceConstants.NAMESPACE);
nameSet.add(JcrRemotingConstants.JCR_NAME_LN, ItemResourceConstants.NAMESPACE);
nameSet.add(JcrRemotingConstants.JCR_INDEX_LN, ItemResourceConstants.NAMESPACE);
- DavMethodBase method = null;
+ HttpPropfind request = null;
try {
- method = new PropFindMethod(uri, nameSet, DavConstants.DEPTH_0);
+ request = new HttpPropfind(uri, nameSet, DavConstants.DEPTH_0);
- service.getClient(sessionInfo).executeMethod(method);
- MultiStatusResponse[] responses = method.getResponseBodyAsMultiStatus().getResponses();
+ HttpResponse response = service.executeRequest(sessionInfo, request);
+ MultiStatusResponse[] responses = request.getResponseBodyAsMultiStatus(response).getResponses();
if (responses.length != 1) {
throw new ItemNotFoundException("Unable to retrieve the node with id " + uri);
}
@@ -292,8 +294,8 @@ class URIResolverImpl implements URIReso
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {
- if (method != null) {
- method.releaseConnection();
+ if (request != null) {
+ request.releaseConnection();
}
}
}
@@ -324,7 +326,7 @@ class URIResolverImpl implements URIReso
public NodeId getNodeId(String uri, SessionInfo sessionInfo) throws RepositoryException {
return getNodeId(uri, sessionInfo, false);
}
-
+
/**
* @inheritDoc
*/
Added: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/HttpPost.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/HttpPost.java?rev=1774468&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/HttpPost.java (added)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/HttpPost.java Thu Dec 15 14:22:27 2016
@@ -0,0 +1,47 @@
+/*
+ * 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.jackrabbit.spi2davex;
+
+import java.net.URI;
+
+import org.apache.http.HttpResponse;
+import org.apache.jackrabbit.webdav.DavMethods;
+import org.apache.jackrabbit.webdav.DavServletResponse;
+import org.apache.jackrabbit.webdav.client.methods.BaseDavRequest;
+
+public class HttpPost extends BaseDavRequest {
+
+ public HttpPost(URI uri) {
+ super(uri);
+ }
+
+ public HttpPost(String uri) {
+ super(URI.create(uri));
+ }
+
+ @Override
+ public String getMethod() {
+ return DavMethods.METHOD_POST;
+ }
+
+ @Override
+ public boolean succeeded(HttpResponse response) {
+ int statusCode = response.getStatusLine().getStatusCode();
+ return statusCode == DavServletResponse.SC_OK || statusCode == DavServletResponse.SC_NO_CONTENT
+ || statusCode == DavServletResponse.SC_CREATED;
+ }
+}
Propchange: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/HttpPost.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/HttpPost.java
------------------------------------------------------------------------------
svn:executable = *
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java?rev=1774468&r1=1774467&r2=1774468&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java Thu Dec 15 14:22:27 2016
@@ -20,22 +20,28 @@ import java.io.IOException;
import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import javax.jcr.Credentials;
import javax.jcr.ItemNotFoundException;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
-import org.apache.commons.httpclient.methods.multipart.Part;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.FormBodyPart;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.message.BasicNameValuePair;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.commons.json.JsonParser;
import org.apache.jackrabbit.commons.json.JsonUtil;
@@ -71,7 +77,7 @@ import org.apache.jackrabbit.webdav.DavC
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.MultiStatusResponse;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
+import org.apache.jackrabbit.webdav.client.methods.HttpPropfind;
import org.apache.jackrabbit.webdav.header.IfHeader;
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyName;
@@ -281,7 +287,7 @@ public class RepositoryServiceImpl exten
if (qvFactories.containsKey(sessionInfo)) {
qv = qvFactories.get(sessionInfo);
} else {
- ValueLoader loader = new ValueLoader(getClient(sessionInfo));
+ ValueLoader loader = new ValueLoader(getClient(sessionInfo), getContext(sessionInfo));
qv = new QValueFactoryImpl(getNamePathResolver(sessionInfo), loader);
qvFactories.put(sessionInfo, qv);
}
@@ -346,11 +352,14 @@ public class RepositoryServiceImpl exten
String uri = getURI(path, sessionInfo);
int depth = batchReadConfig.getDepth(path, this.getNamePathResolver(sessionInfo));
- GetMethod method = new GetMethod(uri + "." + depth + ".json");
+ HttpGet request = new HttpGet(uri + "." + depth + ".json");
+ HttpResponse response = null;
try {
- int statusCode = getClient(sessionInfo).executeMethod(method);
+ response = executeRequest(sessionInfo, request);
+ int statusCode = response.getStatusLine().getStatusCode();
if (statusCode == DavServletResponse.SC_OK) {
- if (method.getResponseContentLength() == 0) {
+ HttpEntity entity = response.getEntity();
+ if (entity.getContentLength() == 0) {
// no JSON response -> no such node on the server
throw new ItemNotFoundException("No such item " + nodeId);
}
@@ -360,7 +369,7 @@ public class RepositoryServiceImpl exten
ItemInfoJsonHandler handler = new ItemInfoJsonHandler(resolver, nInfo, getRootURI(sessionInfo), getQValueFactory(sessionInfo), getPathFactory(), getIdFactory());
JsonParser ps = new JsonParser(handler);
- ps.parse(method.getResponseBodyAsStream(), method.getResponseCharSet());
+ ps.parse(entity.getContent(), ContentType.get(entity).getCharset().name());
Iterator<? extends ItemInfo> it = handler.getItemInfos();
if (!it.hasNext()) {
@@ -368,15 +377,13 @@ public class RepositoryServiceImpl exten
}
return handler.getItemInfos();
} else {
- throw ExceptionConverter.generate(new DavException(statusCode, "Unable to retrieve NodeInfo for " + uri), method);
+ throw ExceptionConverter.generate(new DavException(statusCode, "Unable to retrieve NodeInfo for " + uri), request);
}
- } catch (HttpException e) {
- throw ExceptionConverter.generate(new DavException(method.getStatusCode(), "Unable to retrieve NodeInfo for " + uri));
} catch (IOException e) {
log.error("Internal error while retrieving NodeInfo.",e);
throw new RepositoryException(e.getMessage());
} finally {
- method.releaseConnection();
+ request.releaseConnection();
}
}
}
@@ -388,19 +395,19 @@ public class RepositoryServiceImpl exten
public PropertyInfo getPropertyInfo(SessionInfo sessionInfo, PropertyId propertyId) throws RepositoryException {
Path p = getPath(propertyId, sessionInfo);
String uri = getURI(p, sessionInfo);
- PropFindMethod method = null;
+ HttpPropfind request = null;
try {
- method = new PropFindMethod(uri, LAZY_PROPERTY_NAME_SET, DavConstants.DEPTH_0);
- getClient(sessionInfo).executeMethod(method);
- method.checkSuccess();
+ request = new HttpPropfind(uri, LAZY_PROPERTY_NAME_SET, DavConstants.DEPTH_0);
+ HttpResponse response = executeRequest(sessionInfo, request);
+ request.checkSuccess(response);
- MultiStatusResponse[] responses = method.getResponseBodyAsMultiStatus().getResponses();
- if (responses.length != 1) {
+ MultiStatusResponse[] mresponses = request.getResponseBodyAsMultiStatus(response).getResponses();
+ if (mresponses.length != 1) {
throw new ItemNotFoundException("Unable to retrieve the PropertyInfo. No such property " + uri);
}
- MultiStatusResponse response = responses[0];
- DavPropertySet props = response.getProperties(DavServletResponse.SC_OK);
+ MultiStatusResponse mresponse = mresponses[0];
+ DavPropertySet props = mresponse.getProperties(DavServletResponse.SC_OK);
int propertyType = PropertyType.valueFromName(props.get(JCR_TYPE).getValue().toString());
if (propertyType == PropertyType.BINARY) {
@@ -436,8 +443,8 @@ public class RepositoryServiceImpl exten
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {
- if (method != null) {
- method.releaseConnection();
+ if (request != null) {
+ request.releaseConnection();
}
}
}
@@ -473,9 +480,12 @@ public class RepositoryServiceImpl exten
super.copy(sessionInfo, srcWorkspaceName, srcNodeId, destParentNodeId, destName);
return;
}
- PostMethod method = null;
+ HttpPost request = null;
try {
- method = new PostMethod(getWorkspaceURI(sessionInfo));
+ request = new HttpPost(getWorkspaceURI(sessionInfo));
+ request.setHeader("Referer", request.getURI().toASCIIString());
+ addIfHeader(sessionInfo, request);
+
NamePathResolver resolver = getNamePathResolver(sessionInfo);
StringBuilder args = new StringBuilder();
@@ -488,28 +498,29 @@ public class RepositoryServiceImpl exten
destParentPath + resolver.getJCRName(destName) :
destParentPath + "/" + resolver.getJCRName(destName));
args.append(destPath);
-
- method.addParameter(PARAM_COPY, args.toString());
- addIfHeader(sessionInfo, method);
- getClient(sessionInfo).executeMethod(method);
-
- method.checkSuccess();
+ List<BasicNameValuePair> nvps = Collections.singletonList(new BasicNameValuePair(PARAM_COPY, args.toString()));
+ HttpEntity entity = new UrlEncodedFormEntity(nvps, Charset.forName("UTF-8"));
+ request.setEntity(entity);
+ HttpResponse response = executeRequest(sessionInfo, request);
+ request.checkSuccess(response);
} catch (IOException e) {
throw new RepositoryException(e);
} catch (DavException e) {
- throw ExceptionConverter.generate(e, method);
+ throw ExceptionConverter.generate(e, request);
} finally {
- if (method != null) {
- method.releaseConnection();
+ if (request != null) {
+ request.releaseConnection();
}
}
}
@Override
public void clone(SessionInfo sessionInfo, String srcWorkspaceName, NodeId srcNodeId, NodeId destParentNodeId, Name destName, boolean removeExisting) throws RepositoryException {
- PostMethod method = null;
+ HttpPost request = null;
try {
- method = new PostMethod(getWorkspaceURI(sessionInfo));
+ request = new HttpPost(getWorkspaceURI(sessionInfo));
+ request.setHeader("Referer", request.getURI().toASCIIString());
+ addIfHeader(sessionInfo, request);
NamePathResolver resolver = getNamePathResolver(sessionInfo);
StringBuilder args = new StringBuilder();
@@ -524,29 +535,28 @@ public class RepositoryServiceImpl exten
args.append(destPath);
args.append(",");
args.append(Boolean.toString(removeExisting));
-
- method.addParameter(PARAM_CLONE, args.toString());
- addIfHeader(sessionInfo, method);
- getClient(sessionInfo).executeMethod(method);
-
- method.checkSuccess();
+ List<BasicNameValuePair> nvps = Collections.singletonList(new BasicNameValuePair(PARAM_CLONE, args.toString()));
+ HttpEntity entity = new UrlEncodedFormEntity(nvps, Charset.forName("UTF-8"));
+ request.setEntity(entity);
+ HttpResponse response = executeRequest(sessionInfo, request);
+ request.checkSuccess(response);
if (removeExisting) {
clearItemUriCache(sessionInfo);
}
} catch (IOException e) {
throw new RepositoryException(e);
} catch (DavException e) {
- throw ExceptionConverter.generate(e, method);
+ throw ExceptionConverter.generate(e, request);
} finally {
- if (method != null) {
- method.releaseConnection();
+ if (request != null) {
+ request.releaseConnection();
}
}
}
- private static void addIfHeader(SessionInfo sInfo, HttpMethod method) {
+ private static void addIfHeader(SessionInfo sInfo, HttpUriRequest request) {
try {
- initMethod(method, sInfo, true);
+ initMethod(request, sInfo, true);
} catch (RepositoryException e) {
// should never get here
log.error("Unable to retrieve lock tokens: omitted from request header.");
@@ -559,7 +569,8 @@ public class RepositoryServiceImpl exten
private final ItemId targetId;
private final SessionInfo sessionInfo;
- private final List<Part> parts;
+ private final List<FormBodyPart> parts;
+ private final List<QValue> binaries;
private final List<String> diff;
/*
If this batch needs to remove multiple same-name-siblings starting
@@ -568,7 +579,7 @@ public class RepositoryServiceImpl exten
*/
private final Map<Path, Path> removed = new HashMap<Path, Path>();
- private PostMethod method; // TODO: use PATCH request instead.
+ private HttpPost request; // TODO: use PATCH request instead.
private boolean isConsumed;
// flag to determine if the uri-lookup needs to be cleared... e.g.
// after a move operation.
@@ -577,15 +588,18 @@ public class RepositoryServiceImpl exten
private BatchImpl(ItemId targetId, SessionInfo sessionInfo) {
this.targetId = targetId;
this.sessionInfo = sessionInfo;
- parts = new ArrayList<Part>();
- diff = new ArrayList<String>();
+ this.parts = new ArrayList<FormBodyPart>();
+ this.binaries = new ArrayList<QValue>();
+ this.diff = new ArrayList<String>();
}
private void start() throws RepositoryException {
checkConsumed();
+ request.setHeader("Referer", request.getURI().toASCIIString());
+
// add lock tokens
- addIfHeader(sessionInfo, method);
+ addIfHeader(sessionInfo, request);
// insert the content of 'batchMap' part containing the ordered list
// of methods to be executed:
@@ -600,33 +614,36 @@ public class RepositoryServiceImpl exten
// add the diff part - always do multipart in case the receiving servlet
// engine has a form-size restriction (JCR-3726)
Utils.addPart(PARAM_DIFF, buf.toString(), parts);
- Part[] partArr = parts.toArray(new Part[parts.size()]);
- RequestEntity entity = new MultipartRequestEntity(partArr, method.getParams());
- method.setRequestEntity(entity);
- HttpClient client = getClient(sessionInfo);
+ MultipartEntityBuilder b = MultipartEntityBuilder.create();
+ for (FormBodyPart p : parts) {
+ b.addPart(p.getName(), p.getBody());
+ }
+ request.setEntity(b.build());
+
+ org.apache.http.client.HttpClient client = getClient(sessionInfo);
try {
- client.executeMethod(method);
- method.checkSuccess();
+ HttpResponse response = client.execute(request, getContext(sessionInfo));
+ request.checkSuccess(response);
if (clear) {
RepositoryServiceImpl.super.clearItemUriCache(sessionInfo);
}
} catch (IOException e) {
throw new RepositoryException(e);
} catch (DavException e) {
- throw ExceptionConverter.generate(e, method);
+ throw ExceptionConverter.generate(e, request);
} finally {
- method.releaseConnection();
+ request.releaseConnection();
}
}
private void dispose() {
- method = null;
+ request = null;
isConsumed = true;
// discard binary parts (JCR-2582)
- for (Part part : parts) {
- if (part instanceof BinaryPart) {
- ((BinaryPart) part).dispose();
+ for (QValue bin : binaries) {
+ if (bin instanceof ValueLoader.Target) {
+ ((ValueLoader.Target) bin).reset();
}
}
}
@@ -638,19 +655,19 @@ public class RepositoryServiceImpl exten
}
private boolean isEmpty() {
- return method == null;
+ return request == null;
}
private void assertMethod() throws RepositoryException {
- if (method == null) {
+ if (request == null) {
String uri = getURI(targetId, sessionInfo);
- method = new PostMethod(uri);
+ request = new HttpPost(uri);
// ship lock-tokens as if-header to circumvent problems with
// locks created by this session.
String[] locktokens = sessionInfo.getLockTokens();
if (locktokens != null && locktokens.length > 0) {
IfHeader ifH = new IfHeader(locktokens);
- method.setRequestHeader(ifH.getHeaderName(), ifH.getHeaderValue());
+ request.setHeader(ifH.getHeaderName(), ifH.getHeaderValue());
}
}
}
@@ -794,7 +811,7 @@ public class RepositoryServiceImpl exten
Path normalizedPath = getPathFactory().create(getPath(parentId, sessionInfo), contentTree.getName(), true);
String jcrPath = getNamePathResolver(sessionInfo).getJCRPath(normalizedPath);
- appendDiff(SYMBOL_ADD_NODE, jcrPath, ((JsonTree) contentTree).toJsonString(parts));
+ appendDiff(SYMBOL_ADD_NODE, jcrPath, ((JsonTree) contentTree).toJsonString(parts, binaries));
}
//----------------------------------------------------------------------
@@ -829,7 +846,7 @@ public class RepositoryServiceImpl exten
String strValue = Utils.getJsonString(value);
appendDiff(SYMBOL_SET_PROPERTY, jcrPropPath, strValue);
if (strValue == null) {
- Utils.addPart(jcrPropPath, value, resolver, parts);
+ Utils.addPart(jcrPropPath, value, resolver, parts, binaries);
}
}
@@ -844,7 +861,7 @@ public class RepositoryServiceImpl exten
for (int i = 0; i < values.length; i++) {
String str = Utils.getJsonString(values[i]);
if (str == null) {
- Utils.addPart(jcrPropPath, values[i], resolver, parts);
+ Utils.addPart(jcrPropPath, values[i], resolver, parts, binaries);
} else {
String delim = (i == 0) ? "" : ",";
strVal.append(delim).append(str);
@@ -901,7 +918,8 @@ public class RepositoryServiceImpl exten
class JsonTree extends AbstractTree {
private final StringBuilder properties = new StringBuilder();
- private final List<Part> parts = new ArrayList<Part>();
+ private final List<FormBodyPart> parts = new ArrayList<FormBodyPart>();
+ private final List<QValue> binaries = new ArrayList<QValue>();
private final SessionInfo sessionInfo;
JsonTree(SessionInfo sessionInfo, Name nodeName, Name ntName, String uniqueId, NamePathResolver resolver) {
@@ -924,7 +942,7 @@ public class RepositoryServiceImpl exten
String valueStr = Utils.getJsonString(value);
if (valueStr == null) {
String jcrPropPath = createPath(parentId, propertyName);
- Utils.addPart(jcrPropPath, value, getResolver(), parts);
+ Utils.addPart(jcrPropPath, value, getResolver(), parts, binaries);
} else {
properties.append(valueStr);
}
@@ -941,7 +959,7 @@ public class RepositoryServiceImpl exten
String valueStr = Utils.getJsonString(value);
if (valueStr == null) {
String jcrPropPath = createPath(parentId, propertyName);
- Utils.addPart(jcrPropPath, value, getResolver(), parts);
+ Utils.addPart(jcrPropPath, value, getResolver(), parts, binaries);
} else {
String delim = (index++ == 0) ? "" : ",";
properties.append(delim).append('"').append(valueStr).append('"');
@@ -956,10 +974,12 @@ public class RepositoryServiceImpl exten
}
//--------------------------------------------------------------------------
- String toJsonString(List<Part> batchParts) throws RepositoryException {
+ String toJsonString(List<FormBodyPart> batchParts, List<QValue> bins) throws RepositoryException {
batchParts.addAll(this.parts);
+ bins.addAll(this.binaries);
for (Tree child : this.getChildren()) {
batchParts.addAll(((JsonTree) child).getParts());
+ bins.addAll(((JsonTree) child).getBinaries());
}
StringBuilder json = new StringBuilder();
@@ -995,8 +1015,12 @@ public class RepositoryServiceImpl exten
return properties;
}
- private List<Part> getParts() {
+ private List<FormBodyPart> getParts() {
return parts;
}
- }
+
+ private List<QValue> getBinaries() {
+ return binaries;
+ }
+}
}
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Utils.java?rev=1774468&r1=1774467&r2=1774468&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Utils.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Utils.java Thu Dec 15 14:22:27 2016
@@ -16,21 +16,28 @@
*/
package org.apache.jackrabbit.spi2davex;
+import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+
+import javax.jcr.Binary;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import org.apache.commons.httpclient.methods.multipart.Part;
-import org.apache.commons.httpclient.methods.multipart.PartBase;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.FormBodyPart;
+import org.apache.http.entity.mime.FormBodyPartBuilder;
+import org.apache.http.entity.mime.content.InputStreamBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.jackrabbit.commons.json.JsonUtil;
import org.apache.jackrabbit.commons.webdav.JcrValueType;
import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.commons.json.JsonUtil;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
final class Utils {
private static final String DEFAULT_CHARSET = "UTF-8";
+ private static final ContentType DEFAULT_TYPE = ContentType.create("text/plain", DEFAULT_CHARSET);
private Utils() {};
@@ -72,8 +79,8 @@ final class Utils {
* @param paramName
* @param value
*/
- static void addPart(String paramName, String value, List<Part> parts) {
- parts.add(new StringPart(paramName, value, DEFAULT_CHARSET));
+ static void addPart(String paramName, String value, List<FormBodyPart> parts) {
+ parts.add(FormBodyPartBuilder.create().setName(paramName).setBody(new StringBody(value, DEFAULT_TYPE)).build());
}
/**
@@ -83,32 +90,41 @@ final class Utils {
* @param resolver
* @throws RepositoryException
*/
- static void addPart(String paramName, QValue value, NamePathResolver resolver, List<Part> parts) throws RepositoryException {
- Part part;
+ static void addPart(String paramName, QValue value, NamePathResolver resolver, List<FormBodyPart> parts, List<QValue> binaries) throws RepositoryException {
+ FormBodyPartBuilder builder = FormBodyPartBuilder.create().setName(paramName);
+ ContentType ctype = ContentType.create(JcrValueType.contentTypeFromType(value.getType()), DEFAULT_CHARSET);
+
+ FormBodyPart part;
switch (value.getType()) {
case PropertyType.BINARY:
- part = new BinaryPart(paramName, new BinaryPartSource(value), JcrValueType.contentTypeFromType(PropertyType.BINARY), DEFAULT_CHARSET);
+ binaries.add(value);
+ part = builder.setBody(new InputStreamBody(value.getStream(), ctype)).build();
break;
case PropertyType.NAME:
- part = new StringPart(paramName, resolver.getJCRName(value.getName()), DEFAULT_CHARSET);
+ part = builder.setBody(new StringBody(resolver.getJCRName(value.getName()), ctype)).build();
break;
case PropertyType.PATH:
- part = new StringPart(paramName, resolver.getJCRPath(value.getPath()), DEFAULT_CHARSET);
+ part = builder.setBody(new StringBody(resolver.getJCRPath(value.getPath()), ctype)).build();
break;
default:
- part = new StringPart(paramName, value.getString(), DEFAULT_CHARSET);
+ part = builder.setBody(new StringBody(value.getString(), ctype)).build();
}
- String ctype = JcrValueType.contentTypeFromType(value.getType());
- ((PartBase) part).setContentType(ctype);
parts.add(part);
}
- static void removeParts(String paramName, List<Part> parts) {
- for (Iterator<Part> it = parts.iterator(); it.hasNext();) {
- Part part = it.next();
+ static void removeParts(String paramName, List<FormBodyPart> parts) {
+ for (Iterator<FormBodyPart> it = parts.iterator(); it.hasNext();) {
+ FormBodyPart part = it.next();
if (part.getName().equals(paramName)) {
it.remove();
+ if (part.getBody() instanceof InputStreamBody) {
+ try {
+ ((InputStreamBody) part.getBody()).getInputStream().close();
+ } catch (IOException ex) {
+ // best effort
+ }
+ }
}
}
}
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java?rev=1774468&r1=1774467&r2=1774468&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java Thu Dec 15 14:22:27 2016
@@ -16,10 +16,21 @@
*/
package org.apache.jackrabbit.spi2davex;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.HeadMethod;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
+import org.apache.http.protocol.HttpContext;
import org.apache.jackrabbit.commons.webdav.JcrRemotingConstants;
import org.apache.jackrabbit.spi2dav.ExceptionConverter;
import org.apache.jackrabbit.spi2dav.ItemResourceConstants;
@@ -27,65 +38,59 @@ import org.apache.jackrabbit.webdav.DavC
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.MultiStatusResponse;
-import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
+import org.apache.jackrabbit.webdav.client.methods.HttpPropfind;
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
import org.apache.jackrabbit.webdav.property.DavPropertySet;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* <code>ValueLoader</code>...
*/
class ValueLoader {
private final HttpClient client;
+ private final HttpContext context;
- ValueLoader(HttpClient client) {
+ ValueLoader(HttpClient client, HttpContext context) {
this.client = client;
+ this.context = context;
}
void loadBinary(String uri, int index, Target target) throws RepositoryException, IOException {
- GetMethod method = new GetMethod(uri);
+ HttpGet request = new HttpGet(uri);
try {
- int statusCode = client.executeMethod(method);
+ HttpResponse response = client.execute(request, context);
+ int statusCode = response.getStatusLine().getStatusCode();
if (statusCode == DavServletResponse.SC_OK) {
- target.setStream(method.getResponseBodyAsStream());
+ target.setStream(response.getEntity().getContent());
} else {
- throw ExceptionConverter.generate(new DavException(statusCode, ("Unable to load binary at " + uri + " - Status line = " + method.getStatusLine().toString())));
+ throw ExceptionConverter.generate(new DavException(statusCode, ("Unable to load binary at " + uri + " - Status line = " + response.getStatusLine())));
}
} finally {
- method.releaseConnection();
+ request.releaseConnection();
}
}
public Map<String, String> loadHeaders(String uri, String[] headerNames) throws IOException,
RepositoryException {
- HeadMethod method = new HeadMethod(uri);
+ HttpHead request = new HttpHead(uri);
try {
- int statusCode = client.executeMethod(method);
+ HttpResponse response = client.execute(request, context);
+ int statusCode = response.getStatusLine().getStatusCode();
if (statusCode == DavServletResponse.SC_OK) {
Map<String, String> headers = new HashMap<String, String>();
for (String name : headerNames) {
- Header hdr = method.getResponseHeader(name);
+ Header hdr = response.getFirstHeader(name);
if (hdr != null) {
headers.put(name, hdr.getValue());
}
}
return headers;
} else {
- throw ExceptionConverter.generate(new DavException(statusCode, ("Unable to load headers at " + uri + " - Status line = " + method.getStatusLine().toString())));
+ throw ExceptionConverter.generate(new DavException(statusCode, ("Unable to load headers at " + uri + " - Status line = " + response.getStatusLine().toString())));
}
} finally {
- method.releaseConnection();
+ request.releaseConnection();
}
}
@@ -93,13 +98,13 @@ class ValueLoader {
DavPropertyNameSet nameSet = new DavPropertyNameSet();
nameSet.add(JcrRemotingConstants.JCR_TYPE_LN, ItemResourceConstants.NAMESPACE);
- DavMethodBase method = null;
+ HttpPropfind request = null;
try {
- method = new PropFindMethod(uri, nameSet, DavConstants.DEPTH_0);
- client.executeMethod(method);
- method.checkSuccess();
+ request = new HttpPropfind(uri, nameSet, DavConstants.DEPTH_0);
+ HttpResponse response = client.execute(request, context);
+ request.checkSuccess(response);
- MultiStatusResponse[] responses = method.getResponseBodyAsMultiStatus().getResponses();
+ MultiStatusResponse[] responses = request.getResponseBodyAsMultiStatus(response).getResponses();
if (responses.length == 1) {
DavPropertySet props = responses[0].getProperties(DavServletResponse.SC_OK);
DavProperty<?> type = props.get(JcrRemotingConstants.JCR_TYPE_LN, ItemResourceConstants.NAMESPACE);
@@ -114,8 +119,8 @@ class ValueLoader {
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {
- if (method != null) {
- method.releaseConnection();
+ if (request != null) {
+ request.releaseConnection();
}
}
}
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/test/java/org/apache/jackrabbit/spi2dav/DavPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/test/java/org/apache/jackrabbit/spi2dav/DavPropertyTest.java?rev=1774468&r1=1774467&r2=1774468&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/test/java/org/apache/jackrabbit/spi2dav/DavPropertyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/test/java/org/apache/jackrabbit/spi2dav/DavPropertyTest.java Thu Dec 15 14:22:27 2016
@@ -16,8 +16,16 @@
*/
package org.apache.jackrabbit.spi2dav;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpStatus;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Calendar;
+
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.spi.AbstractSPITest;
import org.apache.jackrabbit.spi.Batch;
@@ -36,7 +44,7 @@ import org.apache.jackrabbit.spi.commons
import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.MultiStatus;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
+import org.apache.jackrabbit.webdav.client.methods.HttpPropfind;
import org.apache.jackrabbit.webdav.observation.ObservationConstants;
import org.apache.jackrabbit.webdav.ordering.OrderingConstants;
import org.apache.jackrabbit.webdav.property.DavPropertyName;
@@ -47,12 +55,6 @@ import org.apache.jackrabbit.webdav.vers
import org.apache.jackrabbit.webdav.version.VersionHistoryResource;
import org.apache.jackrabbit.webdav.version.VersionResource;
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Calendar;
-
/**
* <code>DavPropertyTest</code>...
*/
@@ -64,7 +66,7 @@ public class DavPropertyTest extends Abs
private NamePathResolver resolver;
private String repoURI;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -132,34 +134,34 @@ public class DavPropertyTest extends Abs
}
private DavPropertyNameSet doPropFindNames(String uri) throws Exception {
- PropFindMethod method = new PropFindMethod(uri, DavConstants.PROPFIND_PROPERTY_NAMES, DavConstants.DEPTH_0);
+ HttpPropfind request = new HttpPropfind(uri, DavConstants.PROPFIND_PROPERTY_NAMES, DavConstants.DEPTH_0);
HttpClient cl = rs.getClient(si);
- cl.executeMethod(method);
- method.checkSuccess();
+ HttpResponse response = cl.execute(request, rs.getContext(si));
+ request.checkSuccess(response);
- MultiStatus ms = method.getResponseBodyAsMultiStatus();
+ MultiStatus ms = request.getResponseBodyAsMultiStatus(response);
assertEquals(1, ms.getResponses().length);
return ms.getResponses()[0].getPropertyNames(HttpStatus.SC_OK);
}
private DavPropertyNameSet doPropFindAll(String uri) throws Exception {
- PropFindMethod method = new PropFindMethod(uri, DavConstants.PROPFIND_ALL_PROP, DavConstants.DEPTH_0);
+ HttpPropfind request = new HttpPropfind(uri, DavConstants.PROPFIND_ALL_PROP, DavConstants.DEPTH_0);
HttpClient cl = rs.getClient(si);
- cl.executeMethod(method);
- method.checkSuccess();
+ HttpResponse response = cl.execute(request, rs.getContext(si));
+ request.checkSuccess(response);
- MultiStatus ms = method.getResponseBodyAsMultiStatus();
+ MultiStatus ms = request.getResponseBodyAsMultiStatus(response);
assertEquals(1, ms.getResponses().length);
return ms.getResponses()[0].getPropertyNames(HttpStatus.SC_OK);
}
private DavPropertyNameSet doPropFindByProp(String uri, DavPropertyNameSet props) throws Exception {
- PropFindMethod method = new PropFindMethod(uri, DavConstants.PROPFIND_BY_PROPERTY, props, DavConstants.DEPTH_0);
+ HttpPropfind request = new HttpPropfind(uri, DavConstants.PROPFIND_BY_PROPERTY, props, DavConstants.DEPTH_0);
HttpClient cl = rs.getClient(si);
- cl.executeMethod(method);
- method.checkSuccess();
+ HttpResponse response = cl.execute(request, rs.getContext(si));
+ request.checkSuccess(response);
- MultiStatus ms = method.getResponseBodyAsMultiStatus();
+ MultiStatus ms = request.getResponseBodyAsMultiStatus(response);
assertEquals(1, ms.getResponses().length);
return ms.getResponses()[0].getPropertyNames(HttpStatus.SC_OK);
}
@@ -192,7 +194,7 @@ public class DavPropertyTest extends Abs
expected.remove(DeltaVConstants.SUPPORTED_REPORT_SET);
/*
Expected all-props
-
+
{DAV:}getlastmodified
{DAV:}creationdate
{DAV:}displayname
@@ -212,7 +214,7 @@ public class DavPropertyTest extends Abs
DavPropertyNameSet result = doPropFindByProp(repoURI, props);
assertPropertyNames(props, result);
}
-
+
public void testWorkspace() throws Exception {
StringBuilder uri = new StringBuilder(repoURI);
uri.append("/").append(helper.getProperty(RepositoryServiceStub.PROP_PREFIX + "." +RepositoryServiceStub.PROP_WORKSPACE));
@@ -452,7 +454,7 @@ public class DavPropertyTest extends Abs
expected.add(OrderingConstants.ORDERING_TYPE);
/*
Expected property names
-
+
{DAV:}getlastmodified
{DAV:}ordering-type
{http://www.day.com/jcr/webdav/1.0}definition
@@ -632,7 +634,7 @@ public class DavPropertyTest extends Abs
rs.submit(b);
String uri = rs.getItemUri(nid, si);
-
+
DavPropertyNameSet set = doPropFindNames(uri);
DavPropertyNameSet expected = new DavPropertyNameSet(BASE_SET);
expected.addAll(EXISTING_ITEM_BASE_SET);
@@ -969,7 +971,7 @@ public class DavPropertyTest extends Abs
rs.checkin(si, nid);
String uri = rs.getItemUri(nid, si);
-
+
DavPropertyNameSet set = doPropFindNames(uri);
DavPropertyNameSet expected = new DavPropertyNameSet(BASE_SET);
expected.addAll(EXISTING_ITEM_BASE_SET);
@@ -1313,8 +1315,6 @@ public class DavPropertyTest extends Abs
private static final DavPropertyName JCR_PATH = DavPropertyName.create(JCR_PATH_LN, NAMESPACE);
private static final DavPropertyName JCR_DEPTH = DavPropertyName.create(JCR_DEPTH_LN, NAMESPACE);
private static final DavPropertyName JCR_PARENT = DavPropertyName.create(JCR_PARENT_LN, NAMESPACE);
- private static final DavPropertyName JCR_ISNEW = DavPropertyName.create(JCR_ISNEW_LN, NAMESPACE);
- private static final DavPropertyName JCR_ISMODIFIED = DavPropertyName.create(JCR_ISMODIFIED_LN, NAMESPACE);
private static final DavPropertyName JCR_DEFINITION = DavPropertyName.create(JCR_DEFINITION_LN, NAMESPACE);
private static final DavPropertyName JCR_PRIMARYNODETYPE = DavPropertyName.create(JCR_PRIMARYNODETYPE_LN, NAMESPACE);
private static final DavPropertyName JCR_MIXINNODETYPES = DavPropertyName.create(JCR_MIXINNODETYPES_LN, NAMESPACE);