mcconnell 2003/08/27 17:23:52
Modified: threads-tutorial/conf block.xml
threads-tutorial/src/java/org/apache/avalon/cornerstone/threads/tutorial
Counter.java ThreadConsumer.java
Added: threads-tutorial maven.xml
Log:
Add support for avalon-meta generation.
Revision Changes Path
1.1 avalon-components/threads-tutorial/maven.xml
Index: maven.xml
===================================================================
<project default="jar:jar">
<preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
</preGoal>
</project>
1.7 +8 -3 avalon-components/threads-tutorial/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/threads-tutorial/conf/block.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- block.xml 27 Aug 2003 22:22:07 -0000 1.6
+++ block.xml 28 Aug 2003 00:23:52 -0000 1.7
@@ -9,17 +9,22 @@
<classpath>
<repository>
<resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
- <resource id="cornerstone-threads:cornerstone-threads-api"
version="1.0"/>
+ <resource id="commons-collections:commons-collections" version="2.1"/>
+ <resource id="excalibur-pool:excalibur-pool" version="1.2"/>
<resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
<resource id="excalibur-event:excalibur-event" version="1.0.3"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api"
version="1.0"/>
</repository>
</classpath>
</classloader>
+ <categories>
+ <category name="threads/classloader/scanner" priority="ERROR"/>
+ </categories>
+
<include name="threads" id="cornerstone-threads:cornerstone-threads-impl"
version="1.0"/>
<component name="test"
- class="org.apache.avalon.cornerstone.threads.tutorial.ThreadConsumer"
- activation="true"/>
+ class="org.apache.avalon.cornerstone.threads.tutorial.ThreadConsumer" />
</container>
1.2 +1 -0
avalon-components/threads-tutorial/src/java/org/apache/avalon/cornerstone/threads/tutorial/Counter.java
Index: Counter.java
===================================================================
RCS file:
/home/cvs/avalon-components/threads-tutorial/src/java/org/apache/avalon/cornerstone/threads/tutorial/Counter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Counter.java 19 Jun 2003 17:04:00 -0000 1.1
+++ Counter.java 28 Aug 2003 00:23:52 -0000 1.2
@@ -7,6 +7,7 @@
* A demonstration runnable object that simply logs a countdown sequence.
*
* @author Stephen McConnell
+ * @avalon.component name="counter"
*/
public class Counter extends Thread implements LogEnabled
{
1.2 +7 -5
avalon-components/threads-tutorial/src/java/org/apache/avalon/cornerstone/threads/tutorial/ThreadConsumer.java
Index: ThreadConsumer.java
===================================================================
RCS file:
/home/cvs/avalon-components/threads-tutorial/src/java/org/apache/avalon/cornerstone/threads/tutorial/ThreadConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadConsumer.java 19 Jun 2003 17:04:00 -0000 1.1
+++ ThreadConsumer.java 28 Aug 2003 00:23:52 -0000 1.2
@@ -13,15 +13,16 @@
/**
* ThreadConsumer is a example of a component that uses the ThreadManager
- * servicde to aquired a thread pool.
+ * service to aquired a thread pool.
*
+ * @avalon.component name="consumer" lifestyle="singleton" version="1.0"
* @author Stephen McConnell
*/
public class ThreadConsumer extends AbstractLogEnabled implements
Serviceable, Initializable, Disposable
{
/**
- * The service manager fro which serrvices are aquired and released.
+ * The service manager from which serrvices are aquired and released.
*/
private ServiceManager m_manager;
@@ -48,13 +49,14 @@
* @param manager the thread manager
* @exception ServiceException if the thread manager service is
* unresolvable
+ * @avalon.dependency key="threads"
+ * type="org.apache.avalon.cornerstone.services.threads.ThreadManager"
*/
public void service( ServiceManager manager ) throws ServiceException
{
m_manager = manager;
getLogger().info( "aquiring cornerstone threads service" );
m_threads = (ThreadManager) m_manager.lookup( "threads" );
- getLogger().info( "thread manager aquired: " + m_threads );
}
/**
@@ -94,7 +96,7 @@
{
getLogger().info( "disposal" );
- if( !m_control.isFinished() )
+ if( ( m_control != null ) && !m_control.isFinished() )
{
//
// interrupt the child
@@ -126,7 +128,7 @@
// check for errors
//
- if( m_control.getThrowable() != null )
+ if( ( m_control != null ) && ( m_control.getThrowable() != null ) )
{
getLogger().warn(
"thread terminated with exception condition",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
