You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2002/04/30 14:39:40 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util PropertyHelper.java PropertyRetrieverImpl.java VersioningHelper.java
pnever 02/04/30 05:39:40
Modified: src/webdav/server/org/apache/slide/webdav/util
PropertyHelper.java PropertyRetrieverImpl.java
VersioningHelper.java
Log:
Adapted to new determineResourceKind() signature
Revision Changes Path
1.17 +11 -11 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PropertyHelper.java 29 Apr 2002 12:09:02 -0000 1.16
+++ PropertyHelper.java 30 Apr 2002 12:39:40 -0000 1.17
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v 1.16 2002/04/29 12:09:02 juergen Exp $
- * $Revision: 1.16 $
- * $Date: 2002/04/29 12:09:02 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v 1.17 2002/04/30 12:39:40 pnever Exp $
+ * $Revision: 1.17 $
+ * $Date: 2002/04/30 12:39:40 $
*
* ====================================================================
*
@@ -483,7 +483,7 @@
public NodeProperty getProperty(String propertyName, NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String contextPath, String serverURL) throws SlideException, JDOMException {
NodeProperty property = null;
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
if (resourceKind.isSupportedLiveProperty(propertyName)) {
if (AbstractResourceKind.isComputedProperty(propertyName)) {
property = computeProperty(propertyName, revisionDescriptors, revisionDescriptor, contextPath, serverURL);
@@ -612,7 +612,7 @@
public XMLValue computeVersionHistory(NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String contextPath, String serverURL) throws ObjectLockedException, RevisionDescriptorNotFoundException, ServiceAccessException, LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException, JDOMException {
XMLValue xmlValue = new XMLValue();
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof Version) {
Element element = new Element(E_HREF, defNamespace);
element.setText(getAbsoluteURL(serverURL, contextPath, revisionDescriptors.getUri()));
@@ -664,7 +664,7 @@
XMLValue xmlValue = new XMLValue();
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof VersionHistory) {
Element element = new Element(E_HREF, defNamespace);
StringBuffer buffer = new StringBuffer(revisionDescriptors.getUri());
@@ -711,7 +711,7 @@
XMLValue xmlValue = new XMLValue();
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
Set supportedMethodNames = resourceKind.getSupportedMethods();
Iterator iterator = supportedMethodNames.iterator();
Element supportedMethod = null;
@@ -757,7 +757,7 @@
XMLValue xmlValue = new XMLValue();
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
Set supportedLivePropertyNames = resourceKind.getSupportedLiveProperties();
Iterator iterator = supportedLivePropertyNames.iterator();
Element supportedLivePropertyElement = null;
@@ -809,7 +809,7 @@
XMLValue xmlValue = new XMLValue();
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
Set supportedReportNames = resourceKind.getSupportedReports();
Iterator iterator = supportedReportNames.iterator();
Element supportedReportElement = null;
@@ -874,7 +874,7 @@
XMLValue xmlValue = new XMLValue();
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof Version) {
Element basicSearch = new Element(DaslConstants.E_BASICSEARCH, davNamespace);
@@ -946,7 +946,7 @@
XMLValue xmlValue = new XMLValue();
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof Workspace) {
Element basicSearch = new Element(DaslConstants.E_BASICSEARCH, davNamespace);
1.13 +6 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java
Index: PropertyRetrieverImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PropertyRetrieverImpl.java 26 Apr 2002 11:48:55 -0000 1.12
+++ PropertyRetrieverImpl.java 30 Apr 2002 12:39:40 -0000 1.13
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v 1.12 2002/04/26 11:48:55 juergen Exp $
- * $Revision: 1.12 $
- * $Date: 2002/04/26 11:48:55 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v 1.13 2002/04/30 12:39:40 pnever Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/04/30 12:39:40 $
*
* ====================================================================
*
@@ -135,7 +135,7 @@
* providing property information (<code>PropFindMethod</code>,
* <code>ReportMethod</code>) should use this class.
*
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*
* @author <a href="mailto:ralf.stuckert@softwareag.com">Ralf Stuckert</a>
*/
@@ -586,7 +586,7 @@
else {
// Show requested properties value.
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(token, revisionDescriptors, revisionDescriptor);
Iterator propertyIterator = requestedProperties.getRequestedProperties();
@@ -1599,7 +1599,7 @@
*/
protected void writeAllComputedDeltaVProperties(NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String contextPath, String serverURL, PropertyHelper propertyHelper, XMLPrinter generatedXML) throws SlideException, JDOMException {
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(token, revisionDescriptors, revisionDescriptor);
Set computedLivePropertyNames = resourceKind.getSupportedLiveProperties(Q_COMPUTED_ONLY, new String[] {F_ACCESS_CONTROL, F_LOCKING, F_UPDATE});
Iterator iterator = computedLivePropertyNames.iterator();
while (iterator.hasNext()) {
1.41 +12 -12 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- VersioningHelper.java 30 Apr 2002 08:45:41 -0000 1.40
+++ VersioningHelper.java 30 Apr 2002 12:39:40 -0000 1.41
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v 1.40 2002/04/30 08:45:41 juergen Exp $
- * $Revision: 1.40 $
- * $Date: 2002/04/30 08:45:41 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v 1.41 2002/04/30 12:39:40 pnever Exp $
+ * $Revision: 1.41 $
+ * $Date: 2002/04/30 12:39:40 $
*
* ====================================================================
*
@@ -286,7 +286,7 @@
NodeRevisionDescriptors rNrds = retrieveRevisionDescriptors( resourcePath );
NodeRevisionDescriptor rNrd = retrieveLatestRevisionDescriptor( resourcePath, rNrds );
NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
- ResourceKind rRk = AbstractResourceKind.determineResourceKind( resourcePath, rNrd );
+ ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken, resourcePath, rNrd );
if( !rRk.isSupportedMethod(req.getMethod()) ) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
@@ -409,8 +409,8 @@
}
catch( ObjectNotFoundException e ) {}; // can be ignored here!
- ResourceKind rRk = AbstractResourceKind.determineResourceKind( resourcePath, rNrd );
- ResourceKind evRk = AbstractResourceKind.determineResourceKind( existingVersionPath, evNrd );
+ ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken, resourcePath, rNrd );
+ ResourceKind evRk = AbstractResourceKind.determineResourceKind( nsaToken, existingVersionPath, evNrd );
if( !(rRk instanceof DeltavCompliantUnmappedUrl) ) {
throw new PreconditionViolationException(
@@ -490,7 +490,7 @@
}
catch( ObjectNotFoundException e ) {}; // can be ignored here!
- ResourceKind rRk = AbstractResourceKind.determineResourceKind( resourcePath, rNrd );
+ ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken, resourcePath, rNrd );
if( !(rRk instanceof DeltavCompliantUnmappedUrl) ) {
throw new PreconditionViolationException(
@@ -613,7 +613,7 @@
Iterator i;
String rUri = getUri( rNrds, rNrd );
- ResourceKind rRk = AbstractResourceKind.determineResourceKind( rUri, rNrd );
+ ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken, rNrds, rNrd );
if( !rRk.isSupportedMethod(req.getMethod()) ) {
// check precondition C_MUST_BE_CHECKED_IN
@@ -704,7 +704,7 @@
Iterator i;
Enumeration j;
String rUri = getUri( rNrds, rNrd );
- ResourceKind rRk = AbstractResourceKind.determineResourceKind( rUri, rNrd );
+ ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken, rNrds, rNrd );
if( !rRk.isSupportedMethod(req.getMethod()) ) {
// check precondition C_MUST_BE_CHECKED_IN
@@ -869,7 +869,7 @@
Iterator i;
String rUri = getUri( rNrds, rNrd );
- ResourceKind rRk = AbstractResourceKind.determineResourceKind( rUri, rNrd );
+ ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken, rNrds, rNrd );
// check precondition C_MUST_BE_CHECKED_OUT_VERSION_CONTROLLED_RESOURCE
if ( ! (rRk instanceof CheckedOutVersionControlled) ) {
@@ -945,7 +945,7 @@
Enumeration j;
NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
String rUri = getUri( rNrds, rNrd );
- ResourceKind rRk = AbstractResourceKind.determineResourceKind( rUri, rNrd );
+ ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken, rNrds, rNrd );
if( !rRk.isSupportedMethod(req.getMethod()) ) {
// check precondition C_MUST_BE_CHECKED_OUT
@@ -1667,7 +1667,7 @@
retrieveRevisionDescriptors(nsaToken, sToken, content, resourcePath);
NodeRevisionDescriptor revisionDescriptor =
retrieveLatestRevisionDescriptor(nsaToken, sToken, content, resourcePath, revisionDescriptors);
- ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind( nsaToken, resourcePath, revisionDescriptor);
if ( (resourceKind instanceof VersionControlled) && (label != null) ) {
String vrUri = getUriOfAssociatedVR(nsaToken, sToken, content, revisionDescriptors.getUri());
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>