You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/18 01:33:55 UTC
svn commit: r585755 -
/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/
Author: vgritsenko
Date: Wed Oct 17 16:33:54 2007
New Revision: 585755
URL: http://svn.apache.org/viewvc?rev=585755&view=rev
Log:
webdav to commons logging
Modified:
cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java
cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java
cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java?rev=585755&r1=585754&r2=585755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java Wed Oct 17 16:33:54 2007
@@ -21,7 +21,6 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.util.Properties;
-
import javax.xml.transform.OutputKeys;
import org.apache.avalon.framework.activity.Disposable;
@@ -29,24 +28,25 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.io.IOUtils;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.xml.dom.DOMParser;
+import org.apache.webdav.lib.WebdavResource;
+
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.repository.Repository;
import org.apache.cocoon.components.repository.helpers.CredentialsToken;
-import org.apache.cocoon.components.repository.helpers.RepositoryTransactionHelper;
import org.apache.cocoon.components.repository.helpers.RepositoryPropertyHelper;
+import org.apache.cocoon.components.repository.helpers.RepositoryTransactionHelper;
import org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper;
import org.apache.cocoon.components.webdav.WebDAVUtil;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.xml.XMLUtils;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.io.IOUtils;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.xml.dom.DOMParser;
-import org.apache.webdav.lib.WebdavResource;
+
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
@@ -55,9 +55,11 @@
/**
* A repository implementation for WebDAV.
+ *
+ * @version $Id$
*/
public class WebDAVRepository extends AbstractLogEnabled
-implements Repository, Serviceable, Configurable, Initializable, Disposable {
+ implements Repository, Serviceable, Configurable, Initializable, Disposable {
/** The name of the repository location configuration element */
public static final String REPO_BASE_CONF = "repo-base";
@@ -105,13 +107,6 @@
this.propertyHelper = new WebDAVRepositoryPropertyHelper(this);
this.transactionHelper = new WebDAVRepositoryTransactionHelper(this.credentials, this);
this.versioningHelper = new WebDAVRepositoryVersioningHelper(this);
- LifecycleHelper lh = new LifecycleHelper(this.getLogger(),
- null,
- this.manager,
- null);
- lh.setupComponent(this.propertyHelper, true);
- lh.setupComponent(this.transactionHelper, true);
- lh.setupComponent(this.versioningHelper, true);
}
/* (non-Javadoc)
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java?rev=585755&r1=585754&r2=585755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryPropertyHelper.java Wed Oct 17 16:33:54 2007
@@ -21,24 +21,27 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-
import javax.xml.transform.OutputKeys;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.commons.httpclient.HttpException;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.repository.helpers.RepositoryPropertyHelper;
import org.apache.cocoon.components.source.helpers.SourceProperty;
import org.apache.cocoon.components.webdav.WebDAVUtil;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.xml.XMLUtils;
-import org.apache.commons.httpclient.HttpException;
+
import org.w3c.dom.Node;
/**
* A property helper class for the WebDAV repository
* intended to be used by flowscripts or corresponding wrapper components.
+ *
+ * @version $Id$
*/
public class WebDAVRepositoryPropertyHelper extends AbstractLogEnabled
-implements RepositoryPropertyHelper {
+ implements RepositoryPropertyHelper {
/* The repository component */
private WebDAVRepository repo;
@@ -159,5 +162,4 @@
return false;
}
-
-}
\ No newline at end of file
+}
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java?rev=585755&r1=585754&r2=585755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryTransactionHelper.java Wed Oct 17 16:33:54 2007
@@ -18,18 +18,21 @@
import java.io.IOException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.commons.httpclient.HttpException;
+
import org.apache.cocoon.components.repository.helpers.CredentialsToken;
import org.apache.cocoon.components.repository.helpers.RepositoryTransactionHelper;
import org.apache.cocoon.components.webdav.WebDAVUtil;
-import org.apache.commons.httpclient.HttpException;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* A transaction an locking helper class
* intended to be used by flowscripts or corresponding wrapper components.
+ *
+ * @version $Id$
*/
public class WebDAVRepositoryTransactionHelper extends AbstractLogEnabled
-implements RepositoryTransactionHelper {
+ implements RepositoryTransactionHelper {
/* The repository component */
private WebDAVRepository repo;
@@ -138,5 +141,4 @@
public boolean supportsLocking() {
return true;
}
-
-}
\ No newline at end of file
+}
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java?rev=585755&r1=585754&r2=585755&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/main/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java Wed Oct 17 16:33:54 2007
@@ -19,17 +19,20 @@
import java.io.IOException;
import java.util.List;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.commons.httpclient.HttpException;
+
import org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper;
import org.apache.cocoon.components.webdav.WebDAVUtil;
-import org.apache.commons.httpclient.HttpException;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* A versioning helper class
* intended to be used by flowscripts or corresponding wrapper components.
+ *
+ * @version $Id$
*/
public class WebDAVRepositoryVersioningHelper extends AbstractLogEnabled
-implements RepositoryVersioningHelper {
+ implements RepositoryVersioningHelper {
/* The repository component */
private WebDAVRepository repo;
@@ -39,7 +42,7 @@
*
* @param repo a reference to the WebDAVRepository object.
*/
- public WebDAVRepositoryVersioningHelper (WebDAVRepository repo) {
+ public WebDAVRepositoryVersioningHelper(WebDAVRepository repo) {
this.repo = repo;
}
@@ -135,5 +138,4 @@
//not yet implemented
throw new UnsupportedOperationException();
}
-
-}
\ No newline at end of file
+}