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 ju...@apache.org on 2002/06/21 10:09:12 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util ComputedPropertyProvider.java PropertyHelper.java VersioningHelper.java

juergen     2002/06/21 01:09:12

  Modified:    src/share/org/apache/slide/search SlideUri.java
               src/webdav/server/org/apache/slide/webdav/method
                        CheckinMethod.java CheckoutMethod.java
                        LabelMethod.java MoveMethod.java ReportMethod.java
                        SearchMethod.java UncheckoutMethod.java
               src/webdav/server/org/apache/slide/webdav/util
                        ComputedPropertyProvider.java PropertyHelper.java
                        VersioningHelper.java
  Log:
  Fixed javadoc problems.
  (ralf)
  
  Revision  Changes    Path
  1.5       +4 -4      jakarta-slide/src/share/org/apache/slide/search/SlideUri.java
  
  Index: SlideUri.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/SlideUri.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SlideUri.java	19 Jun 2002 11:00:14 -0000	1.4
  +++ SlideUri.java	21 Jun 2002 08:09:11 -0000	1.5
  @@ -101,7 +101,7 @@
        *
        * @return   a String
        *
  -     * @throws   MalformedURLException
  +     * @throws   InvalidScopeException
        *
        */
       public String getSlidePath (String relPath) throws InvalidScopeException {
  
  
  
  1.10      +3 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckinMethod.java
  
  Index: CheckinMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckinMethod.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CheckinMethod.java	14 Jun 2002 12:24:05 -0000	1.9
  +++ CheckinMethod.java	21 Jun 2002 08:09:11 -0000	1.10
  @@ -116,7 +116,6 @@
        * Parse WebDAV XML query.
        *
        * @throws WebdavException
  -     * @throws IOException
        */
       protected void parseRequest() throws WebdavException {
           
  
  
  
  1.12      +3 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckoutMethod.java
  
  Index: CheckoutMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckoutMethod.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CheckoutMethod.java	14 Jun 2002 12:24:05 -0000	1.11
  +++ CheckoutMethod.java	21 Jun 2002 08:09:11 -0000	1.12
  @@ -125,7 +125,6 @@
        * Parse WebDAV XML query.
        *
        * @throws WebdavException
  -     * @throws IOException
        */
       protected void parseRequest() throws WebdavException {
           
  
  
  
  1.10      +4 -5      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java
  
  Index: LabelMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LabelMethod.java	14 Jun 2002 12:24:05 -0000	1.9
  +++ LabelMethod.java	21 Jun 2002 08:09:11 -0000	1.10
  @@ -195,7 +195,6 @@
        * Parse WebDAV XML query.
        *
        * @throws WebdavException
  -     * @throws IOException
        */
       protected void parseRequest() throws WebdavException {
           readRequestContent();
  
  
  
  1.44      +5 -5      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
  
  Index: MoveMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- MoveMethod.java	19 Jun 2002 11:00:14 -0000	1.43
  +++ MoveMethod.java	21 Jun 2002 08:09:11 -0000	1.44
  @@ -460,7 +460,7 @@
        *
        * @return     the query document.
        */
  -    private Element getWorkingResourceSearchElement(String resourcePath) {
  +    protected Element getWorkingResourceSearchElement(String resourcePath) {
           
           if (basicSearch == null) {
               basicSearch = new Element(DaslConstants.E_BASICSEARCH,
  @@ -515,7 +515,7 @@
        *
        * @throws     SlideException
        */
  -    private void handleWorkspacePostconditions(NodeRevisionDescriptor revisionDescriptor, String resourceUri) throws SlideException {
  +    protected void handleWorkspacePostconditions(NodeRevisionDescriptor revisionDescriptor, String resourceUri) throws SlideException {
   
           if( Configuration.useVersionControl() ) {
               
  
  
  
  1.36      +4 -5      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java
  
  Index: ReportMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ReportMethod.java	19 Jun 2002 11:00:14 -0000	1.35
  +++ ReportMethod.java	21 Jun 2002 08:09:11 -0000	1.36
  @@ -553,7 +553,6 @@
       /**
        * Executes the servlet request.
        *
  -     * @throws     IOException      if any I/O problems occur during execution.
        * @throws     WebdavException  if processing the request fails.
        */
       protected void executeRequest() throws WebdavException {
  
  
  
  1.25      +3 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java
  
  Index: SearchMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- SearchMethod.java	19 Jun 2002 11:00:14 -0000	1.24
  +++ SearchMethod.java	21 Jun 2002 08:09:11 -0000	1.25
  @@ -150,7 +150,6 @@
        * Method parseRequest
        *
        * @throws   WebdavException
  -     * @throws   IOException
        */
       protected void parseRequest() throws WebdavException {
           
  
  
  
  1.8       +3 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UncheckoutMethod.java
  
  Index: UncheckoutMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UncheckoutMethod.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- UncheckoutMethod.java	14 Jun 2002 12:24:06 -0000	1.7
  +++ UncheckoutMethod.java	21 Jun 2002 08:09:11 -0000	1.8
  @@ -118,7 +118,6 @@
        * Parse WebDAV XML query.
        *
        * @throws WebdavException
  -     * @throws IOException
        */
       protected void parseRequest() throws WebdavException {
           readRequestContent();
  
  
  
  1.2       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ComputedPropertyProvider.java
  
  Index: ComputedPropertyProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ComputedPropertyProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComputedPropertyProvider.java	19 Jun 2002 11:00:14 -0000	1.1
  +++ ComputedPropertyProvider.java	21 Jun 2002 08:09:11 -0000	1.2
  @@ -238,7 +238,7 @@
       /**
        * If the property specified by <code>propertyNamespace</code> and
        * <code>propertyName</code> is {@link #isSupportedProperty supported
  -     * by this PropertyProvider), the NodeProperty of the resource located
  +     * by this PropertyProvider}, the NodeProperty of the resource located
        * at the given <code>resourceUri</code> will be returned. Otherwise
        * <code>null</code> is returned.
        *
  @@ -291,7 +291,7 @@
        * Updates the {@link #revisionDescriptors revisionDescriptors} and
        * {@link #revisionDescriptor revisionDescriptor} if the given
        * <code>resourceUri</code> is different from the {@link #lastResourceUri
  -     * last accessed resource URI).
  +     * last accessed resource URI}.
        *
        * @param      resourceUri  the URI of the resource to access next.
        *
  
  
  
  1.26      +6 -17     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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- PropertyHelper.java	19 Jun 2002 11:00:14 -0000	1.25
  +++ PropertyHelper.java	21 Jun 2002 08:09:11 -0000	1.26
  @@ -981,7 +981,7 @@
        *
        * @return     the query document.
        */
  -    private Element getCheckoutSetQueryElement(String resourcePath) throws SlideException {
  +    protected Element getCheckoutSetQueryElement(String resourcePath) throws SlideException {
           
           if (checkoutSetQueryElement == null) {
               
  @@ -1071,7 +1071,7 @@
        *
        * @return     the query document.
        */
  -    private Element getWorkspaceCheckoutSetQueryElement(String scopePath) {
  +    protected Element getWorkspaceCheckoutSetQueryElement(String scopePath) {
           
           if (workspaceCheckoutSetQueryElement == null) {
               
  @@ -1116,15 +1116,11 @@
        *
        * @return   the value of the <code>&lt;lockdiscovery&gt;</code> property.
        *
  -     * @throws   ObjectLockedException
  -     * @throws   RevisionDescriptorNotFoundException
        * @throws   ServiceAccessException
        * @throws   LinkedObjectNotFoundException
  -     * @throws   AccessDeniedException
        * @throws   ObjectNotFoundException
  -     * @throws   JDOMException
        */
  -    public XMLValue computeLockDiscovery(NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String contextPath, String serverURL) throws ObjectLockedException, RevisionDescriptorNotFoundException, ServiceAccessException, LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException, LockTokenNotFoundException, JDOMException {
  +    public XMLValue computeLockDiscovery(NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String contextPath, String serverURL) throws ServiceAccessException, LinkedObjectNotFoundException, ObjectNotFoundException, LockTokenNotFoundException {
           
           Lock lock = nsaToken.getLockHelper();
           NodeLock objectLockToken = null;
  @@ -1150,13 +1146,6 @@
        *
        * @return   the value of the <code>&lt;lockdiscovery&gt;</code> property.
        *
  -     * @throws   ObjectLockedException
  -     * @throws   RevisionDescriptorNotFoundException
  -     * @throws   ServiceAccessException
  -     * @throws   LinkedObjectNotFoundException
  -     * @throws   AccessDeniedException
  -     * @throws   ObjectNotFoundException
  -     * @throws   JDOMException
        */
       public XMLValue computeLockDiscovery(NodeLock objectLockToken, String serverURL, String contextPath) {
   
  
  
  
  1.56      +3 -4      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.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- VersioningHelper.java	16 Jun 2002 16:29:34 -0000	1.55
  +++ VersioningHelper.java	21 Jun 2002 08:09:12 -0000	1.56
  @@ -441,7 +441,6 @@
        *
        * @param rUri the URI of the resource to set the workspace property
        * @param rNrd the NodeRevisionDescriptor to set the workspace property
  -     * @throws SlideException
        */
       public void setWorkspaceProperty( String rUri, NodeRevisionDescriptor rNrd ) {
           UriHandler rUh = UriHandler.getUriHandler( rUri );
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>