bloritsch 2003/03/03 05:48:55
Modified: src/java/org/apache/avalon/cornerstone/blocks/connection
Connection.java DefaultConnectionManager.java
src/java/org/apache/avalon/cornerstone/blocks/datasources
DefaultDataSourceSelector.java
src/java/org/apache/avalon/cornerstone/blocks/event
DefaultEventManager.java
src/java/org/apache/avalon/cornerstone/blocks/masterstore
RepositoryManager.java
src/java/org/apache/avalon/cornerstone/blocks/packet
Acceptor.java DefaultPacketManager.java
src/java/org/apache/avalon/cornerstone/blocks/threads
DefaultThreadManager.java
src/java/org/apache/avalon/cornerstone/services/connection
AbstractService.java AdaptingComponentManager.java
ConnectionManager.java
src/java/org/apache/avalon/cornerstone/services/packet
PacketManager.java
src/java/org/apache/avalon/cornerstone/services/threads
ThreadManager.java
Log:
remove deprecation warnings
Revision Changes Path
1.20 +1 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/Connection.java
Index: Connection.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/Connection.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Connection.java 17 Aug 2002 02:24:24 -0000 1.19
+++ Connection.java 3 Mar 2003 13:48:54 -0000 1.20
@@ -16,7 +16,7 @@
import java.util.Vector;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.avalon.excalibur.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
1.24 +1 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java
Index: DefaultConnectionManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DefaultConnectionManager.java 15 Jan 2003 11:24:39 -0000 1.23
+++ DefaultConnectionManager.java 3 Mar 2003 13:48:54 -0000 1.24
@@ -12,7 +12,7 @@
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
-import org.apache.avalon.excalibur.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
1.2 +1 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasources/DefaultDataSourceSelector.java
Index: DefaultDataSourceSelector.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasources/DefaultDataSourceSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultDataSourceSelector.java 17 Jan 2003 06:20:05 -0000 1.1
+++ DefaultDataSourceSelector.java 3 Mar 2003 13:48:54 -0000 1.2
@@ -181,7 +181,7 @@
if( null == component )
{
- throw new ServiceException( "Unable to provide DataSourceComponent for
" + hint );
+ throw new ServiceException( hint.toString(), "Unable to provide
DataSourceComponent for " + hint );
}
return component;
1.4 +0 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/event/DefaultEventManager.java
Index: DefaultEventManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/event/DefaultEventManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultEventManager.java 14 Feb 2003 19:43:37 -0000 1.3
+++ DefaultEventManager.java 3 Mar 2003 13:48:54 -0000 1.4
@@ -57,7 +57,6 @@
import org.apache.avalon.cornerstone.services.event.Publisher;
import org.apache.avalon.cornerstone.services.event.Register;
import org.apache.avalon.cornerstone.services.event.Subscriber;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
1.15 +6 -6
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java
Index: RepositoryManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RepositoryManager.java 21 Dec 2002 05:51:06 -0000 1.14
+++ RepositoryManager.java 3 Mar 2003 13:48:54 -0000 1.15
@@ -114,7 +114,7 @@
}
catch( final ClassCastException cce )
{
- throw new ServiceException( "Hint is of the wrong type. " +
+ throw new ServiceException( policy.toString(), "Hint is of the wrong
type. " +
"Must be a Configuration", cce );
}
@@ -125,12 +125,12 @@
}
catch( final ConfigurationException ce )
{
- throw new ServiceException( "Malformed configuration has no " +
+ throw new ServiceException( policy.toString(), "Malformed configuration
has no " +
"destinationURL attribute", ce );
}
catch( final MalformedURLException mue )
{
- throw new ServiceException( "destination is malformed. " +
+ throw new ServiceException( policy.toString(), "destination is
malformed. " +
"Must be a valid URL", mue );
}
@@ -151,7 +151,7 @@
{
final String message = "There is already another repository
with the " +
"same destination and type but with different model";
- throw new ServiceException( message );
+ throw new ServiceException( policy.toString(), message );
}
}
else
@@ -184,13 +184,13 @@
final String message = "Cannot find or init repository: " +
e.getMessage();
getLogger().warn( message, e );
- throw new ServiceException( message, e );
+ throw new ServiceException( policy.toString(), message, e );
}
}
}
catch( final ConfigurationException ce )
{
- throw new ServiceException( "Malformed configuration", ce );
+ throw new ServiceException( policy.toString(), "Malformed
configuration", ce );
}
}
1.10 +2 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/Acceptor.java
Index: Acceptor.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/Acceptor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Acceptor.java 5 Aug 2002 14:12:13 -0000 1.9
+++ Acceptor.java 3 Mar 2003 13:48:54 -0000 1.10
@@ -13,10 +13,11 @@
import java.net.DatagramSocket;
import java.util.ArrayList;
import java.util.Iterator;
+
import org.apache.avalon.cornerstone.services.packet.PacketHandler;
import org.apache.avalon.cornerstone.services.packet.PacketHandlerFactory;
-import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.excalibur.thread.ThreadPool;
/**
* Support class for the DefaultPacketManager.
1.15 +2 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/DefaultPacketManager.java
Index: DefaultPacketManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/DefaultPacketManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultPacketManager.java 5 Aug 2002 14:12:13 -0000 1.14
+++ DefaultPacketManager.java 3 Mar 2003 13:48:54 -0000 1.15
@@ -10,15 +10,16 @@
import java.net.DatagramSocket;
import java.util.HashMap;
import java.util.Iterator;
+
import org.apache.avalon.cornerstone.services.packet.PacketHandlerFactory;
import org.apache.avalon.cornerstone.services.packet.PacketManager;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
-import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.excalibur.thread.ThreadPool;
/**
* This is the service through which PacketManagement occurs.
1.21 +2 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java
Index: DefaultThreadManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultThreadManager.java 24 Jan 2003 13:31:10 -0000 1.20
+++ DefaultThreadManager.java 3 Mar 2003 13:48:54 -0000 1.21
@@ -8,13 +8,14 @@
package org.apache.avalon.cornerstone.blocks.threads;
import java.util.HashMap;
+
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
-import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.excalibur.thread.impl.DefaultThreadPool;
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.excalibur.thread.ThreadPool;
import org.apache.excalibur.threadcontext.ThreadContext;
/**
1.15 +2 -2
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java
Index: AbstractService.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractService.java 2 Oct 2002 01:52:16 -0000 1.14
+++ AbstractService.java 3 Mar 2003 13:48:55 -0000 1.15
@@ -13,7 +13,7 @@
import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
-import org.apache.avalon.excalibur.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
@@ -93,7 +93,7 @@
}
catch( final ComponentException ce )
{
- throw new ServiceException( ce.getMessage(), ce );
+ throw new ServiceException( ConnectionHandlerFactory.class.getName(),
ce.getMessage(), ce );
}
}
1.5 +3 -3
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AdaptingComponentManager.java
Index: AdaptingComponentManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AdaptingComponentManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AdaptingComponentManager.java 2 Oct 2002 01:52:16 -0000 1.4
+++ AdaptingComponentManager.java 3 Mar 2003 13:48:55 -0000 1.5
@@ -45,11 +45,11 @@
{
final String error =
"Manager returned a non-component for the role: " + role;
- throw new ComponentException( error, e );
+ throw new ComponentException( role, error, e );
}
catch( final ServiceException se )
{
- throw new ComponentException( se.getMessage(), se );
+ throw new ComponentException( role, se.getMessage(), se );
}
}
1.9 +1 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/ConnectionManager.java
Index: ConnectionManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/ConnectionManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConnectionManager.java 5 Aug 2002 14:12:14 -0000 1.8
+++ ConnectionManager.java 3 Mar 2003 13:48:55 -0000 1.9
@@ -8,7 +8,7 @@
package org.apache.avalon.cornerstone.services.connection;
import java.net.ServerSocket;
-import org.apache.avalon.excalibur.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
/**
* This is the service through which ConnectionManagement occurs.
1.9 +1 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/packet/PacketManager.java
Index: PacketManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/packet/PacketManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PacketManager.java 5 Aug 2002 14:12:14 -0000 1.8
+++ PacketManager.java 3 Mar 2003 13:48:55 -0000 1.9
@@ -8,7 +8,7 @@
package org.apache.avalon.cornerstone.services.packet;
import java.net.DatagramSocket;
-import org.apache.avalon.excalibur.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
/**
* This is the service through which Datagram ConnectionManagement occurs.
1.9 +1 -1
avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/threads/ThreadManager.java
Index: ThreadManager.java
===================================================================
RCS file:
/home/cvs/avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/threads/ThreadManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ThreadManager.java 5 Aug 2002 14:12:15 -0000 1.8
+++ ThreadManager.java 3 Mar 2003 13:48:55 -0000 1.9
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.cornerstone.services.threads;
-import org.apache.avalon.excalibur.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
/**
* Manage a set of ThreadPools.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
