juergen 02/04/26 04:48:55
Modified: src/webdav/server/org/apache/slide/webdav/util
PropertyRetriever.java PropertyRetrieverImpl.java
Log:
Replaced set of specific Exceptions by SlideException.
(ralf)
Revision Changes Path
1.6 +10 -28
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetriever.java
Index: PropertyRetriever.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetriever.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropertyRetriever.java 25 Apr 2002 21:27:31 -0000 1.5
+++ PropertyRetriever.java 26 Apr 2002 11:48:55 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetriever.java,v
1.5 2002/04/25 21:27:31 jericho Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/25 21:27:31 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetriever.java,v
1.6 2002/04/26 11:48:55 juergen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/04/26 11:48:55 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
* providing property information (<code>PropFindMethod</code>,
* <code>ReportMethod</code>) should use an implementation of this interface.
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -121,16 +121,10 @@
* @return the requested properties as list of <code><propstat></code>
* JDOM Element.
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException if creating the JDOM Element fails.
*/
- public List getPropertiesOfObject(RequestedProperties requestedProperties,
String uri, String contextPath, String serverURL, boolean allpropSupportsDeltaV)
throws ObjectLockedException, ServiceAccessException, LinkedObjectNotFoundException,
AccessDeniedException, ObjectNotFoundException, RevisionDescriptorNotFoundException,
LockTokenNotFoundException, JDOMException;
+ public List getPropertiesOfObject(RequestedProperties requestedProperties,
String uri, String contextPath, String serverURL, boolean allpropSupportsDeltaV)
throws SlideException, JDOMException;
/**
* Returns the requested properties of the resource identified by the given
@@ -151,16 +145,10 @@
* @return the requested properties as list of <code><propstat></code>
* JDOM Element.
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException if creating the JDOM Element fails.
*/
- public List getPropertiesOfObject(RequestedProperties requestedProperties,
String uri, NodeRevisionNumber revisionNumber, String contextPath, String serverURL,
boolean allpropSupportsDeltaV) throws ObjectLockedException, ServiceAccessException,
LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException,
RevisionDescriptorNotFoundException, LockTokenNotFoundException, JDOMException;
+ public List getPropertiesOfObject(RequestedProperties requestedProperties,
String uri, NodeRevisionNumber revisionNumber, String contextPath, String serverURL,
boolean allpropSupportsDeltaV) throws SlideException, JDOMException;
/**
* Returns the requested properties of the resource identified by the given
@@ -181,16 +169,10 @@
* @return the requested properties as list of <code><propstat></code>
* JDOM Element.
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException if creating the JDOM Element fails.
*/
- public List getPropertiesOfObject(RequestedProperties requestedProperties,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor, String contextPath, String serverURL, boolean
allpropSupportsDeltaV) throws ObjectLockedException, ServiceAccessException,
LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException,
RevisionDescriptorNotFoundException, LockTokenNotFoundException, JDOMException;
+ public List getPropertiesOfObject(RequestedProperties requestedProperties,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor, String contextPath, String serverURL, boolean
allpropSupportsDeltaV) throws SlideException, JDOMException;
}
1.12 +16 -52
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PropertyRetrieverImpl.java 25 Apr 2002 21:27:31 -0000 1.11
+++ PropertyRetrieverImpl.java 26 Apr 2002 11:48:55 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
1.11 2002/04/25 21:27:31 jericho Exp $
- * $Revision: 1.11 $
- * $Date: 2002/04/25 21:27:31 $
+ * $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 $
*
* ====================================================================
*
@@ -135,7 +135,7 @@
* providing property information (<code>PropFindMethod</code>,
* <code>ReportMethod</code>) should use this class.
*
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -322,16 +322,10 @@
* @return the requested properties as list of <code><propstat></code>
* JDOM Element.
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException if creating the JDOM Element fails.
*/
- public List getPropertiesOfObject(RequestedProperties requestedProperties,
String uri, String contextPath, String serverURL, boolean allpropSupportsDeltaV)
throws ObjectLockedException, ServiceAccessException, LinkedObjectNotFoundException,
AccessDeniedException, ObjectNotFoundException, RevisionDescriptorNotFoundException,
LockTokenNotFoundException, JDOMException {
+ public List getPropertiesOfObject(RequestedProperties requestedProperties,
String uri, String contextPath, String serverURL, boolean allpropSupportsDeltaV)
throws SlideException, JDOMException {
NodeRevisionDescriptors revisionDescriptors = null;
NodeRevisionDescriptor revisionDescriptor = null;
@@ -395,16 +389,10 @@
* @return the requested properties as list of <code><propstat></code>
* JDOM Element.
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException if creating the JDOM Element fails.
*/
- public List getPropertiesOfObject(RequestedProperties requestedProperties,
String uri, NodeRevisionNumber revisionNumber, String contextPath, String serverURL,
boolean allpropSupportsDeltaV) throws ObjectLockedException, ServiceAccessException,
LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException,
RevisionDescriptorNotFoundException, LockTokenNotFoundException, JDOMException {
+ public List getPropertiesOfObject(RequestedProperties requestedProperties,
String uri, NodeRevisionNumber revisionNumber, String contextPath, String serverURL,
boolean allpropSupportsDeltaV) throws SlideException, JDOMException {
NodeRevisionDescriptors revisionDescriptors = content.retrieve(slideToken,
uri);
NodeRevisionDescriptor revisionDescriptor = content.retrieve(slideToken,
@@ -432,16 +420,10 @@
* @return the requested properties as list of <code><propstat></code>
* JDOM Element.
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException if creating the JDOM Element fails.
*/
- public List getPropertiesOfObject(RequestedProperties requestedProperties,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor, String contextPath, String serverURL, boolean
allpropSupportsDeltaV) throws ObjectLockedException, ServiceAccessException,
LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException,
RevisionDescriptorNotFoundException, LockTokenNotFoundException, JDOMException {
+ public List getPropertiesOfObject(RequestedProperties requestedProperties,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor, String contextPath, String serverURL, boolean
allpropSupportsDeltaV) throws SlideException, JDOMException {
XMLPrinter xmlPrinter = new XMLPrinter();
writePropertiesOfObject(requestedProperties, revisionDescriptors,
revisionDescriptor, contextPath, serverURL, allpropSupportsDeltaV, xmlPrinter);
@@ -473,16 +455,10 @@
* all properties are requested.
* @param generatedXML the XMLPrinter to write the output to.
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException
*/
- public void writePropertiesOfObject(RequestedProperties requestedProperties,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor, String contextPath, String serverURL, boolean
allpropSupportsDeltaV, XMLPrinter generatedXML) throws ObjectLockedException,
ServiceAccessException, LinkedObjectNotFoundException, AccessDeniedException,
ObjectNotFoundException, RevisionDescriptorNotFoundException,
LockTokenNotFoundException, JDOMException {
+ public void writePropertiesOfObject(RequestedProperties requestedProperties,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor, String contextPath, String serverURL, boolean
allpropSupportsDeltaV, XMLPrinter generatedXML) throws SlideException, JDOMException {
String status = new String("HTTP/1.1 " + WebdavStatus.SC_OK + " "
+ WebdavStatus.getStatusText
@@ -1593,16 +1569,10 @@
* @param propertyHelper
* @param generatedXML
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException
*/
- protected void writeComputedProperty(String propertyName,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor, String contextPath, String serverURL, PropertyHelper
propertyHelper, XMLPrinter generatedXML) throws ObjectLockedException,
ServiceAccessException, LinkedObjectNotFoundException, AccessDeniedException,
ObjectNotFoundException, RevisionDescriptorNotFoundException,
LockTokenNotFoundException, JDOMException {
+ protected void writeComputedProperty(String propertyName,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor, String contextPath, String serverURL, PropertyHelper
propertyHelper, XMLPrinter generatedXML) throws SlideException, JDOMException {
NodeProperty property = propertyHelper.getProperty(propertyName,
revisionDescriptors, revisionDescriptor, contextPath, serverURL);
if (property != null) {
@@ -1624,16 +1594,10 @@
* @param propertyHelper
* @param generatedXML
*
- * @throws ObjectLockedException
- * @throws ServiceAccessException
- * @throws LinkedObjectNotFoundException
- * @throws AccessDeniedException
- * @throws ObjectNotFoundException
- * @throws RevisionDescriptorNotFoundException
- * @throws LockTokenNotFoundException
+ * @throws SlideException
* @throws JDOMException
*/
- protected void writeAllComputedDeltaVProperties(NodeRevisionDescriptors
revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String contextPath,
String serverURL, PropertyHelper propertyHelper, XMLPrinter generatedXML) throws
ObjectLockedException, ServiceAccessException, LinkedObjectNotFoundException,
AccessDeniedException, ObjectNotFoundException, RevisionDescriptorNotFoundException,
LockTokenNotFoundException, JDOMException {
+ protected void writeAllComputedDeltaVProperties(NodeRevisionDescriptors
revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String contextPath,
String serverURL, PropertyHelper propertyHelper, XMLPrinter generatedXML) throws
SlideException, JDOMException {
ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(revisionDescriptor);
Set computedLivePropertyNames =
resourceKind.getSupportedLiveProperties(Q_COMPUTED_ONLY, new String[]
{F_ACCESS_CONTROL, F_LOCKING, F_UPDATE});
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
