You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by co...@apache.org on 2002/05/15 16:54:04 UTC
cvs commit: jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/collectors SocketCollector.java Resources.properties
colus 02/05/15 07:54:04
Modified: overlord/src/java/org/apache/avalon/overlord Collector.java
CollectorTarget.java GatheringServer.java
Overlord.java
overlord/src/java/org/apache/avalon/overlord/collectors
SocketCollector.java
Removed: overlord/src/java/org/apache/avalon/overlord/collectors
Resources.properties
Log:
Remove dependency on component package.
Restyled.
Revision Changes Path
1.3 +1 -4 jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Collector.java
Index: Collector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Collector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Collector.java 18 Feb 2002 15:04:17 -0000 1.2
+++ Collector.java 15 May 2002 14:54:03 -0000 1.3
@@ -8,9 +8,6 @@
package org.apache.avalon.overlord;
import org.apache.avalon.framework.activity.Executable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* Collect something and do process it like storing, notifing, and etc.
@@ -18,7 +15,7 @@
* @author <a href="mailto:colus@apache.org">Eung-ju Park</a>
*/
public interface Collector
- extends Executable, ThreadSafe, Component
+ extends Executable
{
String ROLE = Collector.class.getName();
}
1.4 +6 -6 jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/CollectorTarget.java
Index: CollectorTarget.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/CollectorTarget.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CollectorTarget.java 18 Feb 2002 15:39:42 -0000 1.3
+++ CollectorTarget.java 15 May 2002 14:54:03 -0000 1.4
@@ -7,10 +7,10 @@
*/
package org.apache.avalon.overlord;
-import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
/**
* Collector wrapper for triggering.
@@ -24,9 +24,9 @@
private static final Resources REZ =
ResourceManager.getPackageResources( CollectorTarget.class );
- private GatheringServer m_server;
- private String m_taskName;
- private String m_collectorName;
+ private GatheringServer m_server;
+ private String m_taskName;
+ private String m_collectorName;
public CollectorTarget( final GatheringServer server,
final String taskName,
@@ -44,7 +44,7 @@
m_server.collect( m_collectorName );
final String message =
- REZ.getString( "target.notice.execute", m_taskName );
+ REZ.getString( "target.notice.execute", m_taskName );
getLogger().info( message );
}
catch ( final Exception e )
1.4 +1 -1 jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/GatheringServer.java
Index: GatheringServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/GatheringServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GatheringServer.java 18 Feb 2002 15:04:17 -0000 1.3
+++ GatheringServer.java 15 May 2002 14:54:03 -0000 1.4
@@ -17,7 +17,7 @@
String ROLE = GatheringServer.class.getName();
/**
- * Collect content.
+ * Collect something.
*
* @param name the name of collector to execute
*/
1.11 +16 -18 jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java
Index: Overlord.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Overlord.java 12 May 2002 10:47:12 -0000 1.10
+++ Overlord.java 15 May 2002 14:54:03 -0000 1.11
@@ -14,7 +14,6 @@
import java.util.Map;
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.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
@@ -101,7 +100,7 @@
final Collector collector =
(Collector)Class.forName( clazz ).newInstance();
- setupComponent( collector,
+ setupCollector( collector,
logger.getChildLogger( name ),
m_context, m_serviceManager, conf );
@@ -122,7 +121,6 @@
final Configuration triggerConf = conf.getChild( "trigger" );
final TimeTrigger trigger = m_triggerFactory.createTimeTrigger( triggerConf );
-
final String targetName = conf.getChild( "target" ).getValue();
addTask( name, trigger, targetName );
@@ -154,7 +152,7 @@
{
final String name = (String)collectorNames.next();
final Collector collector = (Collector)m_collectors.get( name );
- shutdownComponent( collector );
+ shutdownCollector( collector );
}
m_collectors.clear();
m_collectors = null;
@@ -252,44 +250,44 @@
collector.execute();
}
- private void setupComponent( final Component component,
+ private void setupCollector( final Collector collector,
final Logger logger,
final Context context,
final ServiceManager serviceManager,
final Configuration configuration )
throws Exception
{
- if ( component instanceof LogEnabled )
+ if ( collector instanceof LogEnabled )
{
- ( (LogEnabled)component ).enableLogging( logger );
+ ( (LogEnabled)collector ).enableLogging( logger );
}
- if ( component instanceof Contextualizable )
+ if ( collector instanceof Contextualizable )
{
- ( (Contextualizable)component ).contextualize( context );
+ ( (Contextualizable)collector ).contextualize( context );
}
- if ( component instanceof Serviceable )
+ if ( collector instanceof Serviceable )
{
- ( (Serviceable)component ).service( serviceManager );
+ ( (Serviceable)collector ).service( serviceManager );
}
- if ( component instanceof Configurable )
+ if ( collector instanceof Configurable )
{
- ( (Configurable)component ).configure( configuration );
+ ( (Configurable)collector ).configure( configuration );
}
- if ( component instanceof Initializable )
+ if ( collector instanceof Initializable )
{
- ( (Initializable)component ).initialize();
+ ( (Initializable)collector ).initialize();
}
}
- private void shutdownComponent( final Component component )
+ private void shutdownCollector( final Collector collector )
{
- if ( component instanceof Disposable )
+ if ( collector instanceof Disposable )
{
- ( (Disposable)component ).dispose();
+ ( (Disposable)collector ).dispose();
}
}
}
1.6 +8 -13 jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/collectors/SocketCollector.java
Index: SocketCollector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/collectors/SocketCollector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SocketCollector.java 12 May 2002 10:47:12 -0000 1.5
+++ SocketCollector.java 15 May 2002 14:54:03 -0000 1.6
@@ -11,15 +11,13 @@
import java.net.InetAddress;
import java.net.Socket;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
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.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.cornerstone.services.sockets.SocketFactory;
import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.overlord.Collector;
@@ -33,15 +31,12 @@
extends AbstractLogEnabled
implements Serviceable, Configurable, Initializable, Collector
{
- private static final Resources REZ =
- ResourceManager.getPackageResources( SocketCollector.class );
-
- private SocketManager m_socketManager;
- private SocketFactory m_socketFactory;
+ private SocketManager m_socketManager;
+ private SocketFactory m_socketFactory;
- private String m_host;
- private int m_port;
- private String m_socketType;
+ private String m_host;
+ private int m_port;
+ private String m_socketType;
public void service( final ServiceManager serviceManager )
throws ServiceException
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>