You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/09/23 13:16:48 UTC
svn commit: r1174664 - in /jackrabbit/branches/2.2: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Author: jukka
Date: Fri Sep 23 11:16:47 2011
New Revision: 1174664
URL: http://svn.apache.org/viewvc?rev=1174664&view=rev
Log:
2.2: Merged revision 1157175 (JCR-3052)
Modified:
jackrabbit/branches/2.2/ (props changed)
jackrabbit/branches/2.2/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 11:16:47 2011
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100286,1104027,1128175,1130192,1130228,113
2993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1165609,1173196
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100286,1104027,1128175,1130192,1130228,113
2993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196
Modified: jackrabbit/branches/2.2/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=1174664&r1=1174663&r2=1174664&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Fri Sep 23 11:16:47 2011
@@ -212,7 +212,6 @@ public class RepositoryServiceImpl imple
private final int itemInfoCacheSize;
- private final Document domFactory;
private final NamespaceCache nsCache;
private final URIResolverImpl uriResolver;
@@ -251,23 +250,19 @@ public class RepositoryServiceImpl imple
this.itemInfoCacheSize = itemInfoCacheSize;
try {
- domFactory = DomUtil.createDocument();
- } catch (ParserConfigurationException e) {
- throw new RepositoryException(e);
- }
-
- try {
URI repositoryUri = new URI((uri.endsWith("/")) ? uri : uri+"/", true);
hostConfig = new HostConfiguration();
hostConfig.setHost(repositoryUri);
nsCache = new NamespaceCache();
- uriResolver = new URIResolverImpl(repositoryUri, this, domFactory);
+ uriResolver = new URIResolverImpl(repositoryUri, this, DomUtil.createDocument());
NamePathResolver resolver = new NamePathResolverImpl(nsCache);
valueFactory = new ValueFactoryQImpl(qValueFactory, resolver);
} catch (URIException e) {
throw new RepositoryException(e);
+ } catch (ParserConfigurationException e) {
+ throw new RepositoryException(e);
}
connectionManager = new MultiThreadedHttpConnectionManager();
}
@@ -697,7 +692,7 @@ public class RepositoryServiceImpl imple
try {
String uri = getItemUri(itemId, sessionInfo);
ReportInfo reportInfo = new ReportInfo(JcrRemotingConstants.REPORT_PRIVILEGES, ItemResourceConstants.NAMESPACE);
- reportInfo.setContentElement(DomUtil.hrefToXml(uri, domFactory));
+ reportInfo.setContentElement(DomUtil.hrefToXml(uri, DomUtil.createDocument()));
method = new ReportMethod(uriResolver.getWorkspaceUri(sessionInfo.getWorkspaceName()), reportInfo);
getClient(sessionInfo).executeMethod(method);
@@ -726,6 +721,8 @@ public class RepositoryServiceImpl imple
return privileges.containsAll(requiredPrivileges);
} catch (IOException e) {
throw new RepositoryException(e);
+ } catch (ParserConfigurationException e) {
+ throw new RepositoryException(e);
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {
@@ -1352,7 +1349,7 @@ public class RepositoryServiceImpl imple
DavPropertySet ps = responses[0].getProperties(DavServletResponse.SC_OK);
if (ps.contains(DavPropertyName.LOCKDISCOVERY)) {
DavProperty<?> p = ps.get(DavPropertyName.LOCKDISCOVERY);
- LockDiscovery ld = LockDiscovery.createFromXml(p.toXml(domFactory));
+ LockDiscovery ld = LockDiscovery.createFromXml(p.toXml(DomUtil.createDocument()));
NodeId parentId = getParentId(ps, sessionInfo);
return retrieveLockInfo(ld, sessionInfo, nodeId, parentId);
} else {
@@ -1362,6 +1359,8 @@ public class RepositoryServiceImpl imple
}
} catch (IOException e) {
throw new RepositoryException(e);
+ } catch (ParserConfigurationException e) {
+ throw new RepositoryException(e);
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {
@@ -1600,7 +1599,7 @@ public class RepositoryServiceImpl imple
try {
UpdateInfo uInfo;
if (removeExisting || relPath != null) {
- Element uElem = UpdateInfo.createUpdateElement(updateSource, updateType, domFactory);
+ Element uElem = UpdateInfo.createUpdateElement(updateSource, updateType, DomUtil.createDocument());
if (removeExisting) {
DomUtil.addChildElement(uElem, JcrRemotingConstants.XML_REMOVEEXISTING, ItemResourceConstants.NAMESPACE);
}
@@ -1617,6 +1616,8 @@ public class RepositoryServiceImpl imple
execute(method, sessionInfo);
} catch (IOException e) {
throw new RepositoryException(e);
+ } catch (ParserConfigurationException e) {
+ throw new RepositoryException(e);
} catch (DavException e) {
throw ExceptionConverter.generate(e);
}
@@ -1634,10 +1635,11 @@ public class RepositoryServiceImpl imple
*/
public Iterator<NodeId> merge(SessionInfo sessionInfo, NodeId nodeId, String srcWorkspaceName, boolean bestEffort, boolean isShallow) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException {
try {
+ Document doc = DomUtil.createDocument();
String wspHref = uriResolver.getWorkspaceUri(srcWorkspaceName);
- Element mElem = MergeInfo.createMergeElement(new String[] {wspHref}, !bestEffort, false, domFactory);
+ Element mElem = MergeInfo.createMergeElement(new String[] {wspHref}, !bestEffort, false, doc);
if (isShallow) {
- mElem.appendChild(DomUtil.depthToXml(false, domFactory));
+ mElem.appendChild(DomUtil.depthToXml(false, doc));
}
MergeInfo mInfo = new MergeInfo(mElem);
@@ -1653,6 +1655,8 @@ public class RepositoryServiceImpl imple
return failedIds.iterator();
} catch (IOException e) {
throw new RepositoryException(e);
+ } catch (ParserConfigurationException e) {
+ throw new RepositoryException(e);
} catch (DavException e) {
throw ExceptionConverter.generate(e);
}
@@ -1972,7 +1976,7 @@ public class RepositoryServiceImpl imple
if (disc.isEmpty()) {
events = new EventBundle[0];
} else {
- Element discEl = disc.toXml(domFactory);
+ Element discEl = disc.toXml(DomUtil.createDocument());
ElementIterator it = DomUtil.getChildren(discEl,
ObservationConstants.XML_EVENTBUNDLE,
ObservationConstants.NAMESPACE);
@@ -1996,6 +2000,8 @@ public class RepositoryServiceImpl imple
return events;
} catch (IOException e) {
throw new RepositoryException(e);
+ } catch (ParserConfigurationException e) {
+ throw new RepositoryException(e);
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {
@@ -2199,12 +2205,12 @@ public class RepositoryServiceImpl imple
/**
* @see RepositoryService#getQNodeTypeDefinitions(SessionInfo)
*/
- public Iterator<QNodeTypeDefinition> getQNodeTypeDefinitions(SessionInfo sessionInfo) throws RepositoryException {
- ReportInfo info = new ReportInfo(JcrRemotingConstants.REPORT_NODETYPES, ItemResourceConstants.NAMESPACE);
- info.setContentElement(DomUtil.createElement(domFactory, NodeTypeConstants.XML_REPORT_ALLNODETYPES, ItemResourceConstants.NAMESPACE));
-
+ public Iterator<QNodeTypeDefinition> getQNodeTypeDefinitions(SessionInfo sessionInfo) throws RepositoryException {
ReportMethod method = null;
try {
+ ReportInfo info = new ReportInfo(JcrRemotingConstants.REPORT_NODETYPES, ItemResourceConstants.NAMESPACE);
+ info.setContentElement(DomUtil.createElement(DomUtil.createDocument(), NodeTypeConstants.XML_REPORT_ALLNODETYPES, ItemResourceConstants.NAMESPACE));
+
String workspaceUri = uriResolver.getWorkspaceUri(sessionInfo.getWorkspaceName());
method = new ReportMethod(workspaceUri, info);
getClient(sessionInfo).executeMethod(method);
@@ -2214,6 +2220,8 @@ public class RepositoryServiceImpl imple
return retrieveQNodeTypeDefinitions(sessionInfo, reportDoc);
} catch (IOException e) {
throw new RepositoryException(e);
+ } catch (ParserConfigurationException e) {
+ throw new RepositoryException(e);
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {