You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ro...@apache.org on 2004/04/05 12:14:48 UTC
cvs commit: cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/webdav WebDAVUtil.java
roku 2004/04/05 03:14:48
Modified: src/blocks/webdav/java/org/apache/cocoon/components/repository/impl
WebDAVRepository.java
WebDAVRepositoryVersioningHelper.java
src/blocks/webdav/java/org/apache/cocoon/components/webdav
WebDAVUtil.java
Log:
- Fixed small copy n' paste error in WebDAVRepository.createResource
- Fixed some retrun values, so that they return WebDAVResource.*Method(..)
- implemented setVersioned(String, true)
Revision Changes Path
1.3 +2 -4 cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
Index: WebDAVRepository.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebDAVRepository.java 4 Apr 2004 14:57:30 -0000 1.2
+++ WebDAVRepository.java 5 Apr 2004 10:14:48 -0000 1.3
@@ -253,7 +253,7 @@
}
try {
- WebDAVUtil.createResource(uri, content);
+ WebDAVUtil.createResource(this.getAbsoluteURI(uri), content);
return true;
} catch (HttpException he) {
@@ -312,7 +312,6 @@
try {
WebDAVUtil.moveResource(this.getAbsoluteURI(uri), this.getAbsoluteURI(dest), recurse, overwrite);
return true;
-
} catch (HttpException he) {
this.getLogger().error("HTTP Error moving: " + this.repoBaseUrl + uri, he);
} catch (IOException ioe) {
@@ -328,8 +327,7 @@
public boolean remove(String uri) {
try {
- WebDAVUtil.getWebdavResource(this.getAbsoluteURI(uri)).deleteMethod();
- return true;
+ return WebDAVUtil.getWebdavResource(this.getAbsoluteURI(uri)).deleteMethod();
} catch (HttpException he) {
this.getLogger().error("HTTP Error removing: " + this.repoBaseUrl + uri, he);
1.2 +16 -5 cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java
Index: WebDAVRepositoryVersioningHelper.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebDAVRepositoryVersioningHelper.java 2 Apr 2004 14:53:34 -0000 1.1
+++ WebDAVRepositoryVersioningHelper.java 5 Apr 2004 10:14:48 -0000 1.2
@@ -26,6 +26,7 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.components.repository.helpers.CredentialsToken;
import org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper;
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.webdav.WebDAVUtil;
import org.apache.commons.httpclient.HttpException;
@@ -128,18 +129,28 @@
* @see org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper#isVersioned(java.lang.String)
*/
public boolean isVersioned(String uri) {
- //not yet implemented
+ //not yet implemented
throw new UnsupportedOperationException();
}
/* (non-Javadoc)
* @see org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper#setVersioned(java.lang.String, boolean)
*/
- public boolean setVersioned(String uri, boolean versioned) {
- //not yet implemented
- throw new UnsupportedOperationException();
+ public boolean setVersioned(final String uri, final boolean versioned) {
+ try {
+ if(!versioned) // FIXME: Implement this via delete and create
+ throw new UnsupportedOperationException();
+ else
+ return WebDAVUtil.getWebdavResource(this.repo.getAbsoluteURI(uri)).versionControlMethod(this.repo.getAbsoluteURI(uri));
+ } catch (HttpException he) {
+ this.getLogger().error("HTTP Error while versioncontrol " + uri, he);
+ } catch (IOException ioe) {
+ this.getLogger().error("IO Error while versioncontrol " + uri, ioe);
+ }
+
+ return false;
}
-
+
/* (non-Javadoc)
* @see org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper#getVersions(java.lang.String)
*/
1.3 +10 -2 cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/webdav/WebDAVUtil.java
Index: WebDAVUtil.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/webdav/WebDAVUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebDAVUtil.java 29 Mar 2004 23:23:06 -0000 1.2
+++ WebDAVUtil.java 5 Apr 2004 10:14:48 -0000 1.3
@@ -66,13 +66,21 @@
* @param content the content to initialize the resource with.
* @throws HttpException
* @throws IOException
+ * @return Success
*/
static public void createResource(String uri, String content)
throws HttpException, IOException {
HttpURL sourceURL = new HttpURL(uri);
- (new WebdavResource(sourceURL, WebdavResource.NOACTION, WebdavResource.getDefaultDepth()))
- .putMethod(content);
+ System.out.println("WebDAVUtil ####### url="+uri + " content=" + content);
+ final WebdavResource resource = new WebdavResource(sourceURL,
+ WebdavResource.NOACTION,
+ WebdavResource.getDefaultDepth());
+
+ if(!resource.putMethod(content))
+ throw new HttpException("Error creating resource: " + uri
+ + " Status: " + resource.getStatusCode()
+ + " Message: " + resource.getStatusMessage());
}
/**