donaldp 02/03/24 01:56:43
Modified: all/src/java/org/apache/avalon/excalibur/component
DefaultComponentHandler.java
all/src/java/org/apache/avalon/excalibur/monitor
ActiveMonitor.java PassiveMonitor.java
all/src/java/org/apache/avalon/excalibur/pool
ResourceLimitingPool.java
all/src/java/org/apache/avalon/excalibur/testcase
ExcaliburTestCase.java
all/src/java/org/apache/avalon/excalibur/xml/xpath
JaxenProcessorImpl.java XPathProcessorImpl.java
all/src/scratchpad/org/apache/avalon/excalibur/altprofile/component
ProfilerComponentManager.java
ProfilerDefaultComponentFactory.java
all/src/scratchpad/org/apache/avalon/excalibur/altprofile/profiler/gui
AbstractInternalFrame.java ProfilerFrame.java
all/src/scratchpad/org/apache/avalon/excalibur/command
TPCThreadManager.java TPSPThreadManager.java
all/src/scratchpad/org/apache/avalon/excalibur/container
AbstractContainer.java
all/src/scratchpad/org/apache/avalon/excalibur/context
ContextUtility.java
all/src/scratchpad/org/apache/avalon/excalibur/datasource/cluster
AbstractDataSourceCluster.java
DefaultRoundRobinDataSourceCluster.java
all/src/scratchpad/org/apache/avalon/excalibur/datasource/ids
AbstractDataSourceIdGenerator.java
all/src/scratchpad/org/apache/avalon/excalibur/event
SinkClosedException.java SinkFullException.java
all/src/scratchpad/org/apache/avalon/excalibur/i18n
BundleSelector.java
all/src/scratchpad/org/apache/avalon/excalibur/i18n/test
DefaultBundleLoaderTestCase.java
DefaultBundleMatcherTestCase.java
XmlBundleTestCase.java
all/src/scratchpad/org/apache/avalon/excalibur/mpool/test
MultiThreadedPoolComparisonProfile.java
PoolComparisonProfileAbstract.java
SingleThreadedPoolComparisonProfile.java
all/src/scratchpad/org/apache/avalon/excalibur/service
AbstractManager.java ServiceFactory.java
ServiceLoader.java ServiceLoaderContext.java
ServiceRegistry.java
all/src/scratchpad/org/apache/avalon/excalibur/source
ResourceSourceFactory.java SourceResolverImpl.java
all/src/scratchpad/org/apache/avalon/excalibur/system
AbstractContainer.java DefaultContainerManager.java
all/src/scratchpad/org/apache/avalon/excalibur/system/handler
FactoryComponentHandler.java
PerThreadComponentHandler.java
PoolableComponentHandler.java
all/src/scratchpad/org/apache/avalon/excalibur/system/test
ContainerProfile.java
all/src/scratchpad/org/apache/avalon/excalibur/system/util
ConfigurableRoleManager.java ContextBuilder.java
ContextManager.java ExcaliburRoleManager.java
OverridableContext.java
all/src/scratchpad/org/apache/avalon/excalibur/system/util/test
ConfigurableRoleManagerTestCase.java
all/src/scratchpad/org/apache/avalon/excalibur/thread/impl
ResourceLimitingThreadPool.java WorkerThread.java
all/src/scratchpad/org/apache/avalon/excalibur/util/test
ComponentTestCase.java
all/src/test/org/apache/avalon/excalibur/component/test
PoolableComponentHandlerTestCase.java
all/src/test/org/apache/avalon/excalibur/datasource/test
DataSourceJdbcTestCase.java
all/src/test/org/apache/avalon/excalibur/logger/test
LogKitManagementTest.java TestComponent.java
TestComponentImpl.java
all/src/test/org/apache/avalon/excalibur/monitor/test
MonitorTestCase.java
all/src/test/org/apache/avalon/excalibur/pool/test
MultiThreadedPoolComparisonProfile.java
PoolComparisonProfileAbstract.java
SingleThreadedPoolComparisonProfile.java
baxter/src/java/org/apache/avalon/excalibur/baxter
JavaBeanMBean.java
bzip2/src/java/org/apache/avalon/excalibur/bzip2
CBZip2InputStream.java
tar/src/java/org/apache/avalon/excalibur/tar
TarOutputStream.java
tar/src/test/org/apache/avalon/excalibur/tar/test
TarTestCase.java
zip/src/java/org/apache/avalon/excalibur/zip
AsiExtraField.java
zip/src/test/org/apache/avalon/excalibur/zip/test
AsiExtraFieldTestCase.java
ExtraFieldUtilsTestCase.java
Log:
Remove unused imports and restyle
Revision Changes Path
1.11 +1 -2
jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java
Index: DefaultComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultComponentHandler.java 16 Mar 2002 00:05:39 -0000 1.10
+++ DefaultComponentHandler.java 24 Mar 2002 09:56:39 -0000 1.11
@@ -13,7 +13,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.log.Logger;
/**
@@ -23,7 +22,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ryan Shaw</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.10 $ $Date: 2002/03/16 00:05:39 $
+ * @version CVS $Revision: 1.11 $ $Date: 2002/03/24 09:56:39 $
* @since 4.0
*/
public class DefaultComponentHandler
1.9 +1 -2
jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java
Index: ActiveMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ActiveMonitor.java 16 Mar 2002 00:05:41 -0000 1.8
+++ ActiveMonitor.java 24 Mar 2002 09:56:39 -0000 1.9
@@ -11,7 +11,6 @@
import java.util.HashMap;
import java.util.Map;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -36,7 +35,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version $Id: ActiveMonitor.java,v 1.8 2002/03/16 00:05:41 donaldp Exp $
+ * @version $Id: ActiveMonitor.java,v 1.9 2002/03/24 09:56:39 donaldp Exp $
*/
public final class ActiveMonitor extends AbstractLogEnabled
implements Monitor, Startable, ThreadSafe, Configurable, Runnable
1.6 +1 -3
jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/monitor/PassiveMonitor.java
Index: PassiveMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/monitor/PassiveMonitor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PassiveMonitor.java 16 Mar 2002 00:05:41 -0000 1.5
+++ PassiveMonitor.java 24 Mar 2002 09:56:39 -0000 1.6
@@ -11,8 +11,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -36,7 +34,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version $Id: PassiveMonitor.java,v 1.5 2002/03/16 00:05:41 donaldp Exp $
+ * @version $Id: PassiveMonitor.java,v 1.6 2002/03/24 09:56:39 donaldp Exp $
*/
public final class PassiveMonitor extends AbstractLoggable
implements Monitor, ThreadSafe, Configurable
1.4 +1 -2
jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/pool/ResourceLimitingPool.java
Index: ResourceLimitingPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/pool/ResourceLimitingPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceLimitingPool.java 16 Mar 2002 00:05:41 -0000 1.3
+++ ResourceLimitingPool.java 24 Mar 2002 09:56:39 -0000 1.4
@@ -12,7 +12,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
@@ -27,7 +26,7 @@
* trimmed. See the [EMAIL PROTECTED] #trim()} method for details of how
trimming works.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/03/16 00:05:41 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/03/24 09:56:39 $
* @since 4.1
*/
public class ResourceLimitingPool
1.25 +1 -4
jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/testcase/ExcaliburTestCase.java
Index: ExcaliburTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/testcase/ExcaliburTestCase.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ExcaliburTestCase.java 16 Mar 2002 00:05:42 -0000 1.24
+++ ExcaliburTestCase.java 24 Mar 2002 09:56:40 -0000 1.25
@@ -24,11 +24,8 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.log.Hierarchy;
@@ -214,7 +211,7 @@
* </dl>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ExcaliburTestCase.java,v 1.24 2002/03/16 00:05:42 donaldp
Exp $
+ * @version $Id: ExcaliburTestCase.java,v 1.25 2002/03/24 09:56:40 donaldp
Exp $
*/
public class ExcaliburTestCase
extends TestCase
1.7 +1 -2
jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/xml/xpath/JaxenProcessorImpl.java
Index: JaxenProcessorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/xml/xpath/JaxenProcessorImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JaxenProcessorImpl.java 16 Mar 2002 00:05:42 -0000 1.6
+++ JaxenProcessorImpl.java 24 Mar 2002 09:56:40 -0000 1.7
@@ -8,7 +8,6 @@
package org.apache.avalon.excalibur.xml.xpath;
import java.util.List;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.jaxen.dom.XPath;
@@ -28,7 +27,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/03/16 00:05:42 $ $Author:
donaldp $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/03/24 09:56:40 $ $Author:
donaldp $
*/
public class JaxenProcessorImpl
extends AbstractLoggable
1.7 +1 -2
jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/xml/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/xml/xpath/XPathProcessorImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathProcessorImpl.java 16 Mar 2002 00:05:42 -0000 1.6
+++ XPathProcessorImpl.java 24 Mar 2002 09:56:40 -0000 1.7
@@ -7,7 +7,6 @@
*****************************************************************************/
package org.apache.avalon.excalibur.xml.xpath;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.xpath.XPathAPI;
@@ -27,7 +26,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/03/16 00:05:42 $ $Author:
donaldp $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/03/24 09:56:40 $ $Author:
donaldp $
*/
public class XPathProcessorImpl
extends AbstractLoggable
1.3 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/altprofile/component/ProfilerComponentManager.java
Index: ProfilerComponentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/altprofile/component/ProfilerComponentManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProfilerComponentManager.java 16 Mar 2002 00:05:43 -0000 1.2
+++ ProfilerComponentManager.java 24 Mar 2002 09:56:40 -0000 1.3
@@ -12,14 +12,13 @@
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/16 00:05:43 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/24 09:56:40 $
* @since 4.1
*/
public class ProfilerComponentManager
1.3 +1 -17
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/altprofile/component/ProfilerDefaultComponentFactory.java
Index: ProfilerDefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/altprofile/component/ProfilerDefaultComponentFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProfilerDefaultComponentFactory.java 16 Mar 2002 00:05:43 -0000
1.2
+++ ProfilerDefaultComponentFactory.java 24 Mar 2002 09:56:40 -0000
1.3
@@ -13,31 +13,15 @@
import org.apache.avalon.excalibur.component.DefaultComponentFactory;
import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-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.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.avalon.framework.parameters.Parameterizable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* Factory for Avalon Profilable components.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/16 00:05:43 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/24 09:56:40 $
* @since 4.0
*/
public class ProfilerDefaultComponentFactory
1.7 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/altprofile/profiler/gui/AbstractInternalFrame.java
Index: AbstractInternalFrame.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/altprofile/profiler/gui/AbstractInternalFrame.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractInternalFrame.java 16 Mar 2002 00:05:44 -0000 1.6
+++ AbstractInternalFrame.java 24 Mar 2002 09:56:40 -0000 1.7
@@ -15,13 +15,12 @@
import javax.swing.event.InternalFrameEvent;
import javax.swing.event.InternalFrameListener;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/03/16 00:05:44 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/03/24 09:56:40 $
* @since 4.1
*/
abstract class AbstractInternalFrame
1.10 +3 -3
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/altprofile/profiler/gui/ProfilerFrame.java
Index: ProfilerFrame.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/altprofile/profiler/gui/ProfilerFrame.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProfilerFrame.java 20 Mar 2002 03:19:26 -0000 1.9
+++ ProfilerFrame.java 24 Mar 2002 09:56:40 -0000 1.10
@@ -38,7 +38,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.9 $ $Date: 2002/03/20 03:19:26 $
+ * @version CVS $Revision: 1.10 $ $Date: 2002/03/24 09:56:40 $
* @since 4.1
*/
public class ProfilerFrame
@@ -96,7 +96,7 @@
catch( InterruptedException e )
{
}
-
+
// Update each of the ProfileSampleFrames. This is kind of
temporary
// to get rid of the one thread per frame issue.
JInternalFrame[] frames = m_desktopPane.getAllFrames();
@@ -109,7 +109,7 @@
}
}
}
- catch ( Throwable t )
+ catch( Throwable t )
{
// Should not get here, but we want to make sure that this
never happens.
System.out.println( "Unexpected error caught in
ProfilerFrame runner: " + t );
1.8 +0 -1
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/command/TPCThreadManager.java
Index: TPCThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/command/TPCThreadManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TPCThreadManager.java 16 Mar 2002 00:05:45 -0000 1.7
+++ TPCThreadManager.java 24 Mar 2002 09:56:40 -0000 1.8
@@ -18,7 +18,6 @@
import org.apache.avalon.excalibur.util.SystemUtil;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.NullLogger;
-import org.apache.avalon.framework.parameters.Parameters;
/**
* This is a ThreadManager that uses a certain number of threads per
processor.
1.6 +0 -1
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/command/TPSPThreadManager.java
Index: TPSPThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/command/TPSPThreadManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TPSPThreadManager.java 16 Mar 2002 00:05:45 -0000 1.5
+++ TPSPThreadManager.java 24 Mar 2002 09:56:40 -0000 1.6
@@ -15,7 +15,6 @@
import org.apache.avalon.excalibur.thread.ThreadControl;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.excalibur.thread.impl.ResourceLimitingThreadPool;
-import org.apache.avalon.framework.parameters.Parameters;
/**
* This is a ThreadManager which provides a threadpool per Sink per
EventPipeline.
1.9 +0 -1
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/container/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/container/AbstractContainer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractContainer.java 16 Mar 2002 00:05:45 -0000 1.8
+++ AbstractContainer.java 24 Mar 2002 09:56:40 -0000 1.9
@@ -9,7 +9,6 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLoggable;
/**
1.3 +0 -3
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/context/ContextUtility.java
Index: ContextUtility.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/context/ContextUtility.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextUtility.java 16 Mar 2002 00:05:45 -0000 1.2
+++ ContextUtility.java 24 Mar 2002 09:56:40 -0000 1.3
@@ -13,10 +13,7 @@
import java.util.Map;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
/**
1.5 +1 -3
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/datasource/cluster/AbstractDataSourceCluster.java
Index: AbstractDataSourceCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/datasource/cluster/AbstractDataSourceCluster.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractDataSourceCluster.java 16 Mar 2002 00:05:45 -0000 1.4
+++ AbstractDataSourceCluster.java 24 Mar 2002 09:56:40 -0000 1.5
@@ -13,7 +13,6 @@
import org.apache.avalon.excalibur.datasource.NoValidConnectionException;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
@@ -21,12 +20,11 @@
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.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.4 $ $Date: 2002/03/16 00:05:45 $
+ * @version CVS $Revision: 1.5 $ $Date: 2002/03/24 09:56:40 $
* @since 4.1
*/
public abstract class AbstractDataSourceCluster
1.3 +1 -13
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/datasource/cluster/DefaultRoundRobinDataSourceCluster.java
Index: DefaultRoundRobinDataSourceCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/datasource/cluster/DefaultRoundRobinDataSourceCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultRoundRobinDataSourceCluster.java 16 Mar 2002 00:05:45 -0000
1.2
+++ DefaultRoundRobinDataSourceCluster.java 24 Mar 2002 09:56:40 -0000
1.3
@@ -10,18 +10,6 @@
import java.sql.Connection;
import java.sql.SQLException;
import org.apache.avalon.excalibur.datasource.NoValidConnectionException;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.Composable;
-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.logger.Logger;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* The DefaultRoundRobinDataSourceCluster allows the user to specify a
cluster of DataSources
@@ -85,7 +73,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/16 00:05:45 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/24 09:56:40 $
* @since 4.1
*/
public class DefaultRoundRobinDataSourceCluster
1.4 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/datasource/ids/AbstractDataSourceIdGenerator.java
Index: AbstractDataSourceIdGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/datasource/ids/AbstractDataSourceIdGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractDataSourceIdGenerator.java 16 Mar 2002 00:05:45 -0000
1.3
+++ AbstractDataSourceIdGenerator.java 24 Mar 2002 09:56:40 -0000
1.4
@@ -19,12 +19,11 @@
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.thread.ThreadSafe;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/03/16 00:05:45 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/03/24 09:56:40 $
* @since 4.1
*/
public abstract class AbstractDataSourceIdGenerator
1.3 +0 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/event/SinkClosedException.java
Index: SinkClosedException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/event/SinkClosedException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SinkClosedException.java 16 Mar 2002 00:05:46 -0000 1.2
+++ SinkClosedException.java 24 Mar 2002 09:56:40 -0000 1.3
@@ -7,8 +7,6 @@
*/
package org.apache.avalon.excalibur.event;
-import org.apache.avalon.framework.CascadingException;
-
/**
* A SinkClosedException is thrown when an enqueue operation occurs on a
queue
* that is already closed.
1.3 +0 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/event/SinkFullException.java
Index: SinkFullException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/event/SinkFullException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SinkFullException.java 16 Mar 2002 00:05:46 -0000 1.2
+++ SinkFullException.java 24 Mar 2002 09:56:40 -0000 1.3
@@ -7,8 +7,6 @@
*/
package org.apache.avalon.excalibur.event;
-import org.apache.avalon.framework.CascadingException;
-
/**
* A SinkException is thrown when an enqueue operation occurs on a queue
that is
* already full.
1.12 +1 -7
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/BundleSelector.java
Index: BundleSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/BundleSelector.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BundleSelector.java 16 Mar 2002 00:05:47 -0000 1.11
+++ BundleSelector.java 24 Mar 2002 09:56:40 -0000 1.12
@@ -11,25 +11,19 @@
import java.util.Locale;
import java.util.Map;
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.Composable;
-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.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* This is the method for getting instances of ResourceBundles.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Mike Engelhart</a>
- * @version $Id: BundleSelector.java,v 1.11 2002/03/16 00:05:47 donaldp Exp $
+ * @version $Id: BundleSelector.java,v 1.12 2002/03/24 09:56:40 donaldp Exp $
*/
public class BundleSelector extends ExcaliburComponentSelector
1.8 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/test/DefaultBundleLoaderTestCase.java
Index: DefaultBundleLoaderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/test/DefaultBundleLoaderTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultBundleLoaderTestCase.java 16 Mar 2002 00:05:47 -0000 1.7
+++ DefaultBundleLoaderTestCase.java 24 Mar 2002 09:56:40 -0000 1.8
@@ -9,11 +9,10 @@
import org.apache.avalon.excalibur.i18n.BundleSelector;
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.avalon.framework.configuration.Configuration;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
- * @version $Id: DefaultBundleLoaderTestCase.java,v 1.7 2002/03/16 00:05:47
donaldp Exp $
+ * @version $Id: DefaultBundleLoaderTestCase.java,v 1.8 2002/03/24 09:56:40
donaldp Exp $
*/
public class DefaultBundleLoaderTestCase extends ExcaliburTestCase
{
1.6 +1 -3
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/test/DefaultBundleMatcherTestCase.java
Index: DefaultBundleMatcherTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/test/DefaultBundleMatcherTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultBundleMatcherTestCase.java 16 Mar 2002 00:05:47 -0000 1.5
+++ DefaultBundleMatcherTestCase.java 24 Mar 2002 09:56:40 -0000 1.6
@@ -12,15 +12,13 @@
import junit.framework.TestCase;
import org.apache.avalon.excalibur.i18n.BundleInfo;
import org.apache.avalon.excalibur.i18n.BundleMatcher;
-import org.apache.avalon.framework.component.ComponentException;
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.configuration.DefaultConfigurationBuilder;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
- * @version $Id: DefaultBundleMatcherTestCase.java,v 1.5 2002/03/16 00:05:47
donaldp Exp $
+ * @version $Id: DefaultBundleMatcherTestCase.java,v 1.6 2002/03/24 09:56:40
donaldp Exp $
*/
public class DefaultBundleMatcherTestCase extends TestCase
{
1.11 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/test/XmlBundleTestCase.java
Index: XmlBundleTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/test/XmlBundleTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XmlBundleTestCase.java 16 Mar 2002 00:05:47 -0000 1.10
+++ XmlBundleTestCase.java 24 Mar 2002 09:56:40 -0000 1.11
@@ -13,13 +13,12 @@
import org.apache.avalon.excalibur.i18n.BundleInfoMapper;
import org.apache.avalon.excalibur.i18n.XmlBundle;
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.xml.sax.InputSource;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
- * @version $Id: XmlBundleTestCase.java,v 1.10 2002/03/16 00:05:47 donaldp
Exp $
+ * @version $Id: XmlBundleTestCase.java,v 1.11 2002/03/24 09:56:40 donaldp
Exp $
*/
public class XmlBundleTestCase extends ExcaliburTestCase
{
1.5 +1 -3
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/mpool/test/MultiThreadedPoolComparisonProfile.java
Index: MultiThreadedPoolComparisonProfile.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/mpool/test/MultiThreadedPoolComparisonProfile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultiThreadedPoolComparisonProfile.java 16 Mar 2002 00:05:48 -0000
1.4
+++ MultiThreadedPoolComparisonProfile.java 24 Mar 2002 09:56:41 -0000
1.5
@@ -12,8 +12,6 @@
import org.apache.avalon.excalibur.testcase.CascadingAssertionFailedError;
import org.apache.avalon.excalibur.testcase.LatchedThreadGroup;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
/**
@@ -21,7 +19,7 @@
* given a single access thread.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version $Id: MultiThreadedPoolComparisonProfile.java,v 1.4 2002/03/16
00:05:48 donaldp Exp $
+ * @version $Id: MultiThreadedPoolComparisonProfile.java,v 1.5 2002/03/24
09:56:41 donaldp Exp $
*/
public class MultiThreadedPoolComparisonProfile
extends PoolComparisonProfileAbstract
1.9 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/mpool/test/PoolComparisonProfileAbstract.java
Index: PoolComparisonProfileAbstract.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/mpool/test/PoolComparisonProfileAbstract.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PoolComparisonProfileAbstract.java 16 Mar 2002 00:05:48 -0000
1.8
+++ PoolComparisonProfileAbstract.java 24 Mar 2002 09:56:41 -0000
1.9
@@ -13,7 +13,6 @@
import org.apache.avalon.excalibur.mpool.Pool;
import org.apache.avalon.excalibur.mpool.VariableSizePool;
import org.apache.avalon.excalibur.pool.ResourceLimitingPool;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
@@ -22,7 +21,7 @@
* Used as a basis for the PoolComparisonProfile Tests
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version $Id: PoolComparisonProfileAbstract.java,v 1.8 2002/03/16
00:05:48 donaldp Exp $
+ * @version $Id: PoolComparisonProfileAbstract.java,v 1.9 2002/03/24
09:56:41 donaldp Exp $
*/
public abstract class PoolComparisonProfileAbstract
extends TestCase
1.5 +1 -4
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/mpool/test/SingleThreadedPoolComparisonProfile.java
Index: SingleThreadedPoolComparisonProfile.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/mpool/test/SingleThreadedPoolComparisonProfile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SingleThreadedPoolComparisonProfile.java 16 Mar 2002 00:05:48 -0000
1.4
+++ SingleThreadedPoolComparisonProfile.java 24 Mar 2002 09:56:41 -0000
1.5
@@ -10,16 +10,13 @@
import org.apache.avalon.excalibur.mpool.Pool;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Logger;
/**
* This is used to profile and compare various pool implementations
* given a single access thread.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version $Id: SingleThreadedPoolComparisonProfile.java,v 1.4 2002/03/16
00:05:48 donaldp Exp $
+ * @version $Id: SingleThreadedPoolComparisonProfile.java,v 1.5 2002/03/24
09:56:41 donaldp Exp $
*/
public class SingleThreadedPoolComparisonProfile
extends PoolComparisonProfileAbstract
1.4 +0 -1
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/AbstractManager.java
Index: AbstractManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/AbstractManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractManager.java 16 Mar 2002 00:05:48 -0000 1.3
+++ AbstractManager.java 24 Mar 2002 09:56:41 -0000 1.4
@@ -10,7 +10,6 @@
import java.util.Hashtable;
import java.util.Map;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
/**
* Internal helper class the handles the functional requirements of
1.8 +0 -13
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceFactory.java
Index: ServiceFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceFactory.java 16 Mar 2002 00:05:48 -0000 1.7
+++ ServiceFactory.java 24 Mar 2002 09:56:41 -0000 1.8
@@ -13,37 +13,24 @@
import java.util.Map;
import java.util.Vector;
import org.apache.avalon.excalibur.mpool.Pool;
-import org.apache.avalon.framework.CascadingException;
-import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
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.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.AvalonFormatter;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.log.Hierarchy;
-import org.apache.log.Priority;
-import org.apache.log.output.io.StreamTarget;
/**
* The <code>ServiceFactory</code> class provides support for the
1.8 +0 -11
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceLoader.java
Index: ServiceLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceLoader.java 16 Mar 2002 00:05:48 -0000 1.7
+++ ServiceLoader.java 24 Mar 2002 09:56:41 -0000 1.8
@@ -18,16 +18,10 @@
import java.util.Vector;
import org.apache.avalon.framework.CascadingException;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.CascadingThrowable;
import org.apache.avalon.framework.ExceptionUtil;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.DefaultComponentManager;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -36,15 +30,10 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.AvalonFormatter;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.log.Hierarchy;
import org.apache.log.Priority;
import org.apache.log.output.io.StreamTarget;
1.4 +0 -1
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceLoaderContext.java
Index: ServiceLoaderContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceLoaderContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceLoaderContext.java 16 Mar 2002 00:05:49 -0000 1.3
+++ ServiceLoaderContext.java 24 Mar 2002 09:56:41 -0000 1.4
@@ -10,7 +10,6 @@
import java.io.File;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.log.Priority;
/**
* <code>ServiceLoaderContext</code> context to hold command line arguments,
1.6 +0 -4
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceRegistry.java
Index: ServiceRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceRegistry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServiceRegistry.java 16 Mar 2002 00:05:49 -0000 1.5
+++ ServiceRegistry.java 24 Mar 2002 09:56:41 -0000 1.6
@@ -20,11 +20,7 @@
import org.apache.avalon.framework.CascadingRuntimeException;
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.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
/**
* Implementation class that provides support for the registration of
1.6 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/source/ResourceSourceFactory.java
Index: ResourceSourceFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/source/ResourceSourceFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceSourceFactory.java 16 Mar 2002 00:05:49 -0000 1.5
+++ ResourceSourceFactory.java 24 Mar 2002 09:56:41 -0000 1.6
@@ -10,14 +10,13 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
* A factory for the Resource protocol
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: ResourceSourceFactory.java,v 1.5 2002/03/16 00:05:49
donaldp Exp $
+ * @version $Id: ResourceSourceFactory.java,v 1.6 2002/03/24 09:56:41
donaldp Exp $
*/
public class ResourceSourceFactory
extends AbstractLogEnabled
1.22 +1 -5
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/source/SourceResolverImpl.java
Index: SourceResolverImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/source/SourceResolverImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SourceResolverImpl.java 16 Mar 2002 00:05:49 -0000 1.21
+++ SourceResolverImpl.java 24 Mar 2002 09:56:41 -0000 1.22
@@ -15,14 +15,10 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.excalibur.system.Container;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
-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.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -51,7 +47,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version $Id: SourceResolverImpl.java,v 1.21 2002/03/16 00:05:49 donaldp
Exp $
+ * @version $Id: SourceResolverImpl.java,v 1.22 2002/03/24 09:56:41 donaldp
Exp $
*/
public class SourceResolverImpl
extends AbstractLogEnabled
1.24 +17 -6
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/AbstractContainer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractContainer.java 16 Mar 2002 00:05:50 -0000 1.23
+++ AbstractContainer.java 24 Mar 2002 09:56:41 -0000 1.24
@@ -20,11 +20,22 @@
import org.apache.avalon.excalibur.system.handler.ComponentHandler;
import org.apache.avalon.excalibur.system.util.ExcaliburRoleManager;
import org.apache.avalon.excalibur.system.util.RoleManager;
-import org.apache.avalon.framework.activity.*;
-import org.apache.avalon.framework.component.*;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.context.*;
-import org.apache.avalon.framework.logger.*;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
+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.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
* The Container is an interface used to mark the Containers in your system.
It
@@ -32,7 +43,7 @@
* Manager can expose that to the instantiating class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.23 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.24 $ $Date: 2002/03/24 09:56:41 $
*/
public abstract class AbstractContainer
extends AbstractLogEnabled
1.5 +13 -6
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/DefaultContainerManager.java
Index: DefaultContainerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/DefaultContainerManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultContainerManager.java 16 Mar 2002 00:05:50 -0000 1.4
+++ DefaultContainerManager.java 24 Mar 2002 09:56:41 -0000 1.5
@@ -10,14 +10,21 @@
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.excalibur.system.util.ContextManager;
import org.apache.avalon.excalibur.util.ComponentStateValidator;
-import org.apache.avalon.framework.activity.*;
-import org.apache.avalon.framework.component.*;
-import org.apache.avalon.framework.configuration.*;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.activity.Startable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.*;
-import org.apache.avalon.framework.parameters.*;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
/**
* The ContainerManager is a single point of contact to manage your Container
@@ -33,7 +40,7 @@
* </p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.5 $ $Date: 2002/03/24 09:56:41 $
*/
public class DefaultContainerManager implements ContainerManager,
ContainerManagerConstants
{
1.9 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/handler/FactoryComponentHandler.java
Index: FactoryComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/handler/FactoryComponentHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FactoryComponentHandler.java 16 Mar 2002 00:05:50 -0000 1.8
+++ FactoryComponentHandler.java 24 Mar 2002 09:56:41 -0000 1.9
@@ -17,7 +17,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
/**
@@ -25,7 +24,7 @@
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.8 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.9 $ $Date: 2002/03/24 09:56:41 $
* @since 4.0
*/
public final class FactoryComponentHandler
1.9 +1 -3
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/handler/PerThreadComponentHandler.java
Index: PerThreadComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/handler/PerThreadComponentHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PerThreadComponentHandler.java 16 Mar 2002 00:05:50 -0000 1.8
+++ PerThreadComponentHandler.java 24 Mar 2002 09:56:41 -0000 1.9
@@ -12,8 +12,6 @@
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.excalibur.system.Container;
import org.apache.avalon.excalibur.system.util.RoleManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
@@ -25,7 +23,7 @@
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.8 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.9 $ $Date: 2002/03/24 09:56:41 $
* @since 4.0
*/
public final class PerThreadComponentHandler implements ComponentHandler
1.12 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/handler/PoolableComponentHandler.java
Index: PoolableComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/handler/PoolableComponentHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PoolableComponentHandler.java 16 Mar 2002 00:05:50 -0000 1.11
+++ PoolableComponentHandler.java 24 Mar 2002 09:56:41 -0000 1.12
@@ -20,14 +20,13 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.log.Hierarchy;
/**
* The PoolableComponentHandler to make sure components are initialized
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.11 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.12 $ $Date: 2002/03/24 09:56:41 $
* @since 4.0
*/
public final class PoolableComponentHandler implements ComponentHandler
1.12 +7 -5
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/test/ContainerProfile.java
Index: ContainerProfile.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/test/ContainerProfile.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ContainerProfile.java 16 Mar 2002 00:05:50 -0000 1.11
+++ ContainerProfile.java 24 Mar 2002 09:56:41 -0000 1.12
@@ -22,16 +22,18 @@
import org.apache.avalon.excalibur.testcase.LatchedThreadGroup;
import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.context.*;
-import org.apache.avalon.framework.logger.*;
-import org.apache.avalon.framework.parameters.*;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.LogKitLogger;
+import org.apache.avalon.framework.logger.Logger;
/**
* Used as a basis for the PoolComparisonProfile Tests
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version $Id: ContainerProfile.java,v 1.11 2002/03/16 00:05:50 donaldp
Exp $
+ * @version $Id: ContainerProfile.java,v 1.12 2002/03/24 09:56:41 donaldp
Exp $
*/
public final class ContainerProfile
extends TestCase
1.4 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/ConfigurableRoleManager.java
Index: ConfigurableRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/ConfigurableRoleManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurableRoleManager.java 16 Mar 2002 00:05:50 -0000 1.3
+++ ConfigurableRoleManager.java 24 Mar 2002 09:56:41 -0000 1.4
@@ -13,7 +13,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.AbstractLoggable;
/**
* Configurable RoleManager implementation. It populates the RoleManager
@@ -21,7 +20,7 @@
* in the org.apache.avalon.component package.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/03/24 09:56:41 $
* @since 4.1
*/
public class ConfigurableRoleManager
1.5 +5 -3
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/ContextBuilder.java
Index: ContextBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/ContextBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextBuilder.java 16 Mar 2002 00:05:50 -0000 1.4
+++ ContextBuilder.java 24 Mar 2002 09:56:41 -0000 1.5
@@ -5,9 +5,11 @@
import org.apache.avalon.excalibur.event.Queue;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.excalibur.mpool.PoolManager;
-import org.apache.avalon.framework.component.*;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.context.*;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.DefaultContext;
/**
* Helper class to create a context for the ContextManager.
1.11 +10 -5
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/ContextManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ContextManager.java 16 Mar 2002 00:05:50 -0000 1.10
+++ ContextManager.java 24 Mar 2002 09:56:41 -0000 1.11
@@ -20,15 +20,20 @@
import org.apache.avalon.excalibur.source.Source;
import org.apache.avalon.excalibur.source.SourceResolver;
import org.apache.avalon.excalibur.source.SourceResolverImpl;
-import org.apache.avalon.framework.activity.*;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.DefaultComponentManager;
import org.apache.avalon.framework.component.DefaultComponentSelector;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.context.*;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import
org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.parameters.*;
/**
* The ContextManager is used to manage the values in a Container's Context.
@@ -55,7 +60,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
- * @version CVS $Revision: 1.10 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.11 $ $Date: 2002/03/24 09:56:41 $
* @since 4.1
*/
public class ContextManager implements ContextManagerConstants
1.4 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/ExcaliburRoleManager.java
Index: ExcaliburRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/ExcaliburRoleManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExcaliburRoleManager.java 16 Mar 2002 00:05:50 -0000 1.3
+++ ExcaliburRoleManager.java 24 Mar 2002 09:56:41 -0000 1.4
@@ -9,14 +9,13 @@
import java.util.Collections;
import java.util.HashMap;
-import org.apache.avalon.framework.component.Component;
/**
* The Excalibur Role Manager is used for Excalibur Role Mappings. All of
the
* information is hard-coded.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/03/24 09:56:41 $
* @since 4.1
*/
public class ExcaliburRoleManager
1.3 +4 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/OverridableContext.java
Index: OverridableContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/OverridableContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OverridableContext.java 16 Mar 2002 00:05:50 -0000 1.2
+++ OverridableContext.java 24 Mar 2002 09:56:41 -0000 1.3
@@ -7,14 +7,16 @@
*/
package org.apache.avalon.excalibur.system.util;
-import org.apache.avalon.framework.context.*;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.DefaultContext;
/**
* The OverridableContext allows you to "null" out entries, even if they are
* in a parent context.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/03/16 00:05:50 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/03/24 09:56:41 $
* @since 4.1
*/
public final class OverridableContext extends DefaultContext
1.4 +2 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/test/ConfigurableRoleManagerTestCase.java
Index: ConfigurableRoleManagerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/system/util/test/ConfigurableRoleManagerTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurableRoleManagerTestCase.java 16 Mar 2002 00:05:51 -0000
1.3
+++ ConfigurableRoleManagerTestCase.java 24 Mar 2002 09:56:42 -0000
1.4
@@ -9,7 +9,7 @@
import junit.framework.TestCase;
import org.apache.avalon.excalibur.system.util.ConfigurableRoleManager;
-import org.apache.avalon.framework.configuration.*;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
/**
* Configurable RoleManager implementation. It populates the RoleManager
@@ -17,7 +17,7 @@
* in the org.apache.avalon.component package.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/03/16 00:05:51 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/03/24 09:56:42 $
* @since 4.1
*/
public class ConfigurableRoleManagerTestCase
1.5 +1 -2
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/thread/impl/ResourceLimitingThreadPool.java
Index: ResourceLimitingThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/thread/impl/ResourceLimitingThreadPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceLimitingThreadPool.java 16 Mar 2002 00:05:51 -0000 1.4
+++ ResourceLimitingThreadPool.java 24 Mar 2002 09:56:42 -0000 1.5
@@ -15,7 +15,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Executable;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
/**
@@ -30,7 +29,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.4 $ $Date: 2002/03/16 00:05:51 $
+ * @version CVS $Revision: 1.5 $ $Date: 2002/03/24 09:56:42 $
* @since 4.1
*/
public class ResourceLimitingThreadPool
1.8 +0 -1
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/thread/impl/WorkerThread.java
Index: WorkerThread.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/thread/impl/WorkerThread.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WorkerThread.java 16 Mar 2002 00:05:51 -0000 1.7
+++ WorkerThread.java 24 Mar 2002 09:56:42 -0000 1.8
@@ -13,7 +13,6 @@
import org.apache.avalon.excalibur.thread.ThreadControl;
import org.apache.avalon.framework.activity.Executable;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
/**
1.6 +1 -5
jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/util/test/ComponentTestCase.java
Index: ComponentTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/util/test/ComponentTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentTestCase.java 16 Mar 2002 00:05:52 -0000 1.5
+++ ComponentTestCase.java 24 Mar 2002 09:56:42 -0000 1.6
@@ -8,14 +8,10 @@
package org.apache.avalon.excalibur.util.test;
import junit.framework.TestCase;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.DefaultComponentManager;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.NullLogger;
-import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
/**
@@ -23,7 +19,7 @@
* within your own code.
*
* @author <a href="[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/03/16 00:05:52 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/03/24 09:56:42 $
*/
public final class ComponentTestCase
extends TestCase
1.6 +0 -1
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/component/test/PoolableComponentHandlerTestCase.java
Index: PoolableComponentHandlerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/component/test/PoolableComponentHandlerTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PoolableComponentHandlerTestCase.java 16 Mar 2002 00:05:52 -0000
1.5
+++ PoolableComponentHandlerTestCase.java 24 Mar 2002 09:56:42 -0000
1.6
@@ -11,7 +11,6 @@
import org.apache.avalon.excalibur.testcase.BufferedLogger;
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
/**
* Test the PoolableComponentHandler.
1.4 +0 -3
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/datasource/test/DataSourceJdbcTestCase.java
Index: DataSourceJdbcTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/datasource/test/DataSourceJdbcTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DataSourceJdbcTestCase.java 16 Mar 2002 00:05:52 -0000 1.3
+++ DataSourceJdbcTestCase.java 24 Mar 2002 09:56:42 -0000 1.4
@@ -18,9 +18,6 @@
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
/**
* Test the DataSource Component. I don't know how to make this generic,
1.7 +3 -9
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/logger/test/LogKitManagementTest.java
Index: LogKitManagementTest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/logger/test/LogKitManagementTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogKitManagementTest.java 16 Mar 2002 00:05:52 -0000 1.6
+++ LogKitManagementTest.java 24 Mar 2002 09:56:42 -0000 1.7
@@ -8,16 +8,11 @@
package org.apache.avalon.excalibur.logger.test;
import java.io.InputStream;
-import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.log.Hierarchy;
@@ -31,7 +26,7 @@
* LogKitManagementTest.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.6 $ $Date: 2002/03/16 00:05:52 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/03/24 09:56:42 $
*/
public class LogKitManagementTest
{
@@ -41,7 +36,6 @@
//The default logger
private Logger m_logger;
- private ExcaliburComponentManager m_manager;
protected Priority m_logPriority = Priority.DEBUG;
protected LogKitManager m_lkm;
@@ -128,7 +122,7 @@
/**
* Set up logger configuration
*/
- final private Logger setupLogger()
+ private Logger setupLogger()
throws Exception
{
//FIXME(GP): This method should setup a LogConfigurator and
LogManager
@@ -151,7 +145,7 @@
* A method addContext(DefaultContext context) is called here to enable
subclasses
* to put additional objects into the context programmatically.
*/
- final private Context setupContext( final Configuration conf )
+ private Context setupContext( final Configuration configuration )
throws Exception
{
//FIXME(GP): This method should setup the Context object according
to the
1.6 +2 -2
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/logger/test/TestComponent.java
Index: TestComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/logger/test/TestComponent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestComponent.java 11 Dec 2001 09:53:39 -0000 1.5
+++ TestComponent.java 24 Mar 2002 09:56:42 -0000 1.6
@@ -14,12 +14,12 @@
* TestComponent.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/12/11 09:53:39 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/03/24 09:56:42 $
*/
public interface TestComponent
extends Component
{
- String ROLE = "org.apache.avalon.excalibur.logger.test.TestComponent";
+ String ROLE = TestComponent.class.getName();
void test( Logger defaultLogger, String message );
}
1.8 +1 -2
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/logger/test/TestComponentImpl.java
Index: TestComponentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/logger/test/TestComponentImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestComponentImpl.java 11 Dec 2001 09:53:39 -0000 1.7
+++ TestComponentImpl.java 24 Mar 2002 09:56:42 -0000 1.8
@@ -9,13 +9,12 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.log.LogTarget;
/**
* TestComponent.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/12/11 09:53:39 $
+ * @version CVS $Revision: 1.8 $ $Date: 2002/03/24 09:56:42 $
*/
public class TestComponentImpl
extends AbstractLogEnabled
1.9 +1 -2
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/monitor/test/MonitorTestCase.java
Index: MonitorTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/monitor/test/MonitorTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MonitorTestCase.java 16 Mar 2002 00:05:53 -0000 1.8
+++ MonitorTestCase.java 24 Mar 2002 09:56:42 -0000 1.9
@@ -22,13 +22,12 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.log.Priority;
/**
* Junit TestCase for all the monitors in Excalibur.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version $Id: MonitorTestCase.java,v 1.8 2002/03/16 00:05:53 donaldp Exp $
+ * @version $Id: MonitorTestCase.java,v 1.9 2002/03/24 09:56:42 donaldp Exp $
*/
public class MonitorTestCase extends ExcaliburTestCase
{
1.3 +1 -4
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/pool/test/MultiThreadedPoolComparisonProfile.java
Index: MultiThreadedPoolComparisonProfile.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/pool/test/MultiThreadedPoolComparisonProfile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiThreadedPoolComparisonProfile.java 16 Mar 2002 00:05:53 -0000
1.2
+++ MultiThreadedPoolComparisonProfile.java 24 Mar 2002 09:56:42 -0000
1.3
@@ -12,16 +12,13 @@
import org.apache.avalon.excalibur.testcase.CascadingAssertionFailedError;
import org.apache.avalon.excalibur.testcase.LatchedThreadGroup;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Logger;
/**
* This is used to profile and compare various pool implementations
* given a single access thread.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version $Id: MultiThreadedPoolComparisonProfile.java,v 1.2 2002/03/16
00:05:53 donaldp Exp $
+ * @version $Id: MultiThreadedPoolComparisonProfile.java,v 1.3 2002/03/24
09:56:42 donaldp Exp $
*/
public class MultiThreadedPoolComparisonProfile
extends PoolComparisonProfileAbstract
1.3 +1 -2
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/pool/test/PoolComparisonProfileAbstract.java
Index: PoolComparisonProfileAbstract.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/pool/test/PoolComparisonProfileAbstract.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PoolComparisonProfileAbstract.java 16 Mar 2002 00:05:53 -0000
1.2
+++ PoolComparisonProfileAbstract.java 24 Mar 2002 09:56:42 -0000
1.3
@@ -14,7 +14,6 @@
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.excalibur.pool.ResourceLimitingPool;
import org.apache.avalon.excalibur.pool.SoftResourceLimitingPool;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
@@ -23,7 +22,7 @@
* Used as a basis for the PoolComparisonProfile Tests
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version $Id: PoolComparisonProfileAbstract.java,v 1.2 2002/03/16
00:05:53 donaldp Exp $
+ * @version $Id: PoolComparisonProfileAbstract.java,v 1.3 2002/03/24
09:56:42 donaldp Exp $
*/
public abstract class PoolComparisonProfileAbstract
extends TestCase
1.3 +1 -4
jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/pool/test/SingleThreadedPoolComparisonProfile.java
Index: SingleThreadedPoolComparisonProfile.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/all/src/test/org/apache/avalon/excalibur/pool/test/SingleThreadedPoolComparisonProfile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SingleThreadedPoolComparisonProfile.java 16 Mar 2002 00:05:53 -0000
1.2
+++ SingleThreadedPoolComparisonProfile.java 24 Mar 2002 09:56:42 -0000
1.3
@@ -13,16 +13,13 @@
import org.apache.avalon.excalibur.pool.ResourceLimitingPool;
import org.apache.avalon.excalibur.pool.SingleThreadedPool;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Logger;
/**
* This is used to profile and compare various pool implementations
* given a single access thread.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version $Id: SingleThreadedPoolComparisonProfile.java,v 1.2 2002/03/16
00:05:53 donaldp Exp $
+ * @version $Id: SingleThreadedPoolComparisonProfile.java,v 1.3 2002/03/24
09:56:42 donaldp Exp $
*/
public class SingleThreadedPoolComparisonProfile
extends PoolComparisonProfileAbstract
1.2 +1 -2
jakarta-avalon-excalibur/baxter/src/java/org/apache/avalon/excalibur/baxter/JavaBeanMBean.java
Index: JavaBeanMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/baxter/src/java/org/apache/avalon/excalibur/baxter/JavaBeanMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaBeanMBean.java 24 Mar 2002 07:41:30 -0000 1.1
+++ JavaBeanMBean.java 24 Mar 2002 09:56:42 -0000 1.2
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Simons</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/03/24 07:41:30 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/24 09:56:42 $
*/
public class JavaBeanMBean
extends AbstractMBean
@@ -57,7 +57,6 @@
{
this( object, null );
}
-
/**
* Construct a MBean for specified object
1.3 +0 -1
jakarta-avalon-excalibur/bzip2/src/java/org/apache/avalon/excalibur/bzip2/CBZip2InputStream.java
Index: CBZip2InputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/bzip2/src/java/org/apache/avalon/excalibur/bzip2/CBZip2InputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CBZip2InputStream.java 24 Mar 2002 09:34:29 -0000 1.2
+++ CBZip2InputStream.java 24 Mar 2002 09:56:43 -0000 1.3
@@ -9,7 +9,6 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.avalon.excalibur.bzip2.BZip2Constants;
/**
* An input stream that decompresses from the BZip2 format (without the file
1.2 +2 -2
jakarta-avalon-excalibur/tar/src/java/org/apache/avalon/excalibur/tar/TarOutputStream.java
Index: TarOutputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/tar/src/java/org/apache/avalon/excalibur/tar/TarOutputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TarOutputStream.java 21 Mar 2002 13:34:46 -0000 1.1
+++ TarOutputStream.java 24 Mar 2002 09:56:43 -0000 1.2
@@ -9,8 +9,8 @@
import java.io.FilterOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
/**
* The TarOutputStream writes a UNIX tar archive as an OutputStream. Methods
are
@@ -19,7 +19,7 @@
*
* @author Timothy Gerard Endres <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/21 13:34:46 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/24 09:56:43 $
* @see TarInputStream
* @see TarEntry
*/
1.2 +6 -6
jakarta-avalon-excalibur/tar/src/test/org/apache/avalon/excalibur/tar/test/TarTestCase.java
Index: TarTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/tar/src/test/org/apache/avalon/excalibur/tar/test/TarTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TarTestCase.java 21 Mar 2002 13:34:59 -0000 1.1
+++ TarTestCase.java 24 Mar 2002 09:56:43 -0000 1.2
@@ -24,7 +24,7 @@
*
* @todo Find V7 tar and do tests against it
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/21 13:34:59 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/24 09:56:43 $
*/
public final class TarTestCase
extends TestCase
@@ -40,8 +40,8 @@
private static final File BASEDIR_FILE = new File( BASEDIR );
private static final File POSIX_TAR_FILE =
new File( BASEDIR_FILE, "posix.tar" );
-// private static final File V7_TAR_FILE =
-// new File( BASEDIR_FILE, "v7.tar" );
+ // private static final File V7_TAR_FILE =
+ // new File( BASEDIR_FILE, "v7.tar" );
private static final File GNU_TAR_FILE =
new File( BASEDIR_FILE, "gnu.tar" );
private static final File DATA_FILE1 =
@@ -70,14 +70,14 @@
final int size = name.length();
final String filename =
name.substring( 0, size - 11 ).replace( '.', SP );
- return ".." + SP + ".." + SP +
+ return ".." + SP + ".." + SP +
"src" + SP + "test" + SP + filename + SP;
}
public void testReadPosixTar()
throws Exception
{
- compareTar( BASE_DATA_NAME, POSIX_TAR_FILE);
+ compareTar( BASE_DATA_NAME, POSIX_TAR_FILE );
}
public void testReadGnuTar()
@@ -177,7 +177,7 @@
assertEquals( "Entry name", entryName, entry.getName() );
checkEntry( entry );
- final File temp = new File( BASEDIR_FILE, entryName.length() +
"data.txt");//File.createTempFile( "delete-me", "tar" );
+ final File temp = new File( BASEDIR_FILE, entryName.length() +
"data.txt" );//File.createTempFile( "delete-me", "tar" );
final FileOutputStream output = new FileOutputStream( temp );
input.copyEntryContents( output );
shutdownStream( output );
1.4 +6 -6
jakarta-avalon-excalibur/zip/src/java/org/apache/avalon/excalibur/zip/AsiExtraField.java
Index: AsiExtraField.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/zip/src/java/org/apache/avalon/excalibur/zip/AsiExtraField.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AsiExtraField.java 24 Mar 2002 09:48:28 -0000 1.3
+++ AsiExtraField.java 24 Mar 2002 09:56:43 -0000 1.4
@@ -33,7 +33,7 @@
* device numbers are currently not supported.</p>
*
* @author <a href="[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class AsiExtraField
implements ZipExtraField, UnixStat, Cloneable
@@ -266,11 +266,11 @@
*/
public ZipShort getLocalFileDataLength()
{
- return new ZipShort( 4 +// CRC
- 2 +// Mode
- 4 +// SizDev
- 2 +// UID
- 2 +// GID
+ return new ZipShort( 4 + // CRC
+ 2 + // Mode
+ 4 + // SizDev
+ 2 + // UID
+ 2 + // GID
getLinkedFile().getBytes().length );
}
1.3 +1 -1
jakarta-avalon-excalibur/zip/src/test/org/apache/avalon/excalibur/zip/test/AsiExtraFieldTestCase.java
Index: AsiExtraFieldTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/zip/src/test/org/apache/avalon/excalibur/zip/test/AsiExtraFieldTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AsiExtraFieldTestCase.java 24 Mar 2002 09:48:29 -0000 1.2
+++ AsiExtraFieldTestCase.java 24 Mar 2002 09:56:43 -0000 1.3
@@ -9,8 +9,8 @@
import java.util.zip.ZipException;
import junit.framework.TestCase;
-import org.apache.avalon.excalibur.zip.UnixStat;
import org.apache.avalon.excalibur.zip.AsiExtraField;
+import org.apache.avalon.excalibur.zip.UnixStat;
/**
* JUnit testcases AsiExtraField.
1.3 +3 -3
jakarta-avalon-excalibur/zip/src/test/org/apache/avalon/excalibur/zip/test/ExtraFieldUtilsTestCase.java
Index: ExtraFieldUtilsTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/zip/src/test/org/apache/avalon/excalibur/zip/test/ExtraFieldUtilsTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtraFieldUtilsTestCase.java 24 Mar 2002 09:48:29 -0000 1.2
+++ ExtraFieldUtilsTestCase.java 24 Mar 2002 09:56:43 -0000 1.3
@@ -8,12 +8,12 @@
package org.apache.avalon.excalibur.zip.test;
import junit.framework.TestCase;
-import org.apache.avalon.excalibur.zip.UnixStat;
import org.apache.avalon.excalibur.zip.AsiExtraField;
+import org.apache.avalon.excalibur.zip.ExtraFieldUtils;
+import org.apache.avalon.excalibur.zip.UnixStat;
import org.apache.avalon.excalibur.zip.UnrecognizedExtraField;
-import org.apache.avalon.excalibur.zip.ZipShort;
import org.apache.avalon.excalibur.zip.ZipExtraField;
-import org.apache.avalon.excalibur.zip.ExtraFieldUtils;
+import org.apache.avalon.excalibur.zip.ZipShort;
/**
* JUnit testcases ExtraFieldUtils.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
