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/19 03:39:08 UTC
svn commit: r586210 - in
/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl:
Web3ClientImpl.java Web3DataSourceImpl.java Web3DataSourceSelectorImpl.java
Author: vgritsenko
Date: Thu Oct 18 18:39:07 2007
New Revision: 586210
URL: http://svn.apache.org/viewvc?rev=586210&view=rev
Log:
switching to new AbstractLogEnabled
Modified:
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3ClientImpl.java
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceImpl.java
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3ClientImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3ClientImpl.java?rev=586210&r1=586209&r2=586210&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3ClientImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3ClientImpl.java Thu Oct 18 18:39:07 2007
@@ -23,9 +23,9 @@
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.components.web3.Web3Client;
+import org.apache.cocoon.util.AbstractLogEnabled;
import com.sap.mw.jco.IRepository;
import com.sap.mw.jco.JCO;
@@ -36,11 +36,12 @@
* @since 2.1
* @version $Id$
*/
-public class Web3ClientImpl extends AbstractLogEnabled
-implements Web3Client, Disposable, Recyclable, Poolable {
+public class Web3ClientImpl extends AbstractLogEnabled
+ implements Web3Client, Disposable, Recyclable, Poolable {
protected JCO.Client client;
protected String repository;
+
public void initClient(JCO.Client client) {
this.client = client;
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceImpl.java?rev=586210&r1=586209&r2=586210&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceImpl.java Thu Oct 18 18:39:07 2007
@@ -16,19 +16,18 @@
*/
package org.apache.cocoon.components.web3.impl;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.thread.ThreadSafe;
-import EDU.oswego.cs.dl.util.concurrent.Mutex;
-
-import com.sap.mw.jco.JCO;
-
import org.apache.cocoon.components.web3.Web3Client;
import org.apache.cocoon.components.web3.Web3DataSource;
+import org.apache.cocoon.util.AbstractLogEnabled;
+
+import EDU.oswego.cs.dl.util.concurrent.Mutex;
+import com.sap.mw.jco.JCO;
/**
* The Default implementation for R3DataSources in Web3. This uses the
@@ -38,7 +37,7 @@
* @version $Id$
*/
public class Web3DataSourceImpl extends AbstractLogEnabled
-implements Web3DataSource, ThreadSafe {
+ implements Web3DataSource, ThreadSafe {
protected Web3Properties properties;
protected int poolsize = 0;
@@ -50,6 +49,7 @@
private static Mutex lock = new Mutex();
protected ServiceManager manager;
+
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java?rev=586210&r1=586209&r2=586210&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/src/main/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java Thu Oct 18 18:39:07 2007
@@ -23,7 +23,6 @@
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.ServiceSelector;
@@ -32,7 +31,9 @@
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.web3.Web3DataSource;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.util.ClassUtils;
+import org.apache.cocoon.util.avalon.CLLoggerWrapper;
import EDU.oswego.cs.dl.util.concurrent.Mutex;
@@ -42,9 +43,9 @@
* @since 2.1
* @version $Id$
*/
-public class Web3DataSourceSelectorImpl
- extends AbstractLogEnabled
- implements ServiceSelector, Disposable, Serviceable, Configurable, ThreadSafe {
+public class Web3DataSourceSelectorImpl extends AbstractLogEnabled
+ implements ServiceSelector, Disposable, Serviceable, Configurable,
+ ThreadSafe {
/** The service manager instance */
protected ServiceManager manager;
@@ -111,7 +112,7 @@
true,
ClassUtils.getClassLoader());
pool = (Web3DataSource) theClass.newInstance();
- LifecycleHelper.setupComponent(pool, getLogger(), null, this.manager, c);
+ LifecycleHelper.setupComponent(pool, new CLLoggerWrapper(getLogger()), null, this.manager, c);
Web3DataSourceSelectorImpl.pools.put(obj, pool);
}
}
@@ -133,7 +134,7 @@
this.manager = null;
try {
Web3DataSourceSelectorImpl.lock.acquire();
- String sid = null;
+ String sid;
Web3DataSource pool;
for (Enumeration enumeration = Web3DataSourceSelectorImpl.pools.keys();
enumeration.hasMoreElements();