*sigh*
Sorry for the spam. This time I'm actually attaching the _right_
diffs. Third time's a charm.
-Mark
Index: examples/jdbcdatasource/build.sh
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/examples/jdbcdatasource/build.sh,v
retrieving revision 1.1
diff -u -r1.1 build.sh
--- examples/jdbcdatasource/build.sh 7 Feb 2002 07:15:41 -0000 1.1
+++ examples/jdbcdatasource/build.sh 13 Feb 2002 09:40:01 -0000
@@ -3,11 +3,11 @@
LOCAL_AVALON_TOOLS=$AVALON_TOOLS
if [ "$AVALON_TOOLS" = "" ] ; then
- if [ -d ../../jakarta-avalon/tools ] ; then
- LOCAL_AVALON_TOOLS=../../jakarta-avalon/tools
+ if [ -d ../../../jakarta-avalon/tools ] ; then
+ LOCAL_AVALON_TOOLS=../../../jakarta-avalon/tools
else
echo "Unable to locate tools directory at "
- echo "../../jakarta-avalon/tools/"
+ echo "../../../jakarta-avalon/tools/"
echo "Aborting."
exit 1
fi
Index: src/java/org/apache/avalon/excalibur/datasource/DataSourceComponent.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/DataSourceComponent.java,v
retrieving revision 1.4
diff -u -r1.4 DataSourceComponent.java
--- src/java/org/apache/avalon/excalibur/datasource/DataSourceComponent.java 11 Dec
2001 09:53:28 -0000 1.4
+++ src/java/org/apache/avalon/excalibur/datasource/DataSourceComponent.java 13 Feb
+2002 09:40:02 -0000
@@ -26,7 +26,7 @@
/**
* The name of the role for convenience
*/
- String ROLE = "org.apache.avalon.excalibur.datasource.DataSourceComponent";
+ String ROLE = DataSourceComponent.class.getName();
/**
* Gets the Connection to the database
Index: src/java/org/apache/avalon/excalibur/monitor/Monitor.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/monitor/Monitor.java,v
retrieving revision 1.3
diff -u -r1.3 Monitor.java
--- src/java/org/apache/avalon/excalibur/monitor/Monitor.java 11 Dec 2001 09:53:30
-0000 1.3
+++ src/java/org/apache/avalon/excalibur/monitor/Monitor.java 13 Feb 2002 09:40:02
+-0000
@@ -17,7 +17,7 @@
*/
public interface Monitor
{
- String ROLE = "org.apache.avalon.excalibur.monitor.Monitor";
+ String ROLE = Monitor.class.getName();
/**
* Add a resource to monitor. The resource key referenced in the other
Index: src/java/org/apache/avalon/excalibur/pool/Poolable.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/pool/Poolable.java,v
retrieving revision 1.4
diff -u -r1.4 Poolable.java
--- src/java/org/apache/avalon/excalibur/pool/Poolable.java 11 Dec 2001 09:53:32
-0000 1.4
+++ src/java/org/apache/avalon/excalibur/pool/Poolable.java 13 Feb 2002 09:40:02
+-0000
@@ -8,14 +8,39 @@
package org.apache.avalon.excalibur.pool;
/**
- * Poolable marker interface.
- *
- * Components implement this interface if it is reasonable to
- * Pool the object. Components that don't implement this interface
- * will be created anew via a factory.
- *
- * NB: It was a deliberat e choice not to extend Component. This will have to
+ * <code>Poolable</code> is a marker interface for Components that can
+ * be pooled. Components that are not pooled are created anew via a
+ * factory every time a request is made for the component.
+ * <p>
+ * Components implementing this interface can add the following
+ * attributes to its definition:
+ * <pre><code>
+ * <component pool-min="1" pool-max="10" pool-grow="1">
+ * <tag>value</tag>
+ * </component>
+ * </pre></code>
+ * Where:
+ * <table border="0" cellpadding="4" cellspacing="0">
+ * <tr>
+ * <td valign="top"><code>pool-min</code></td>
+ * <td valign="top">sets the minimum number of Components maintained by the
+ * pool</td>
+ * </tr>
+ * <tr>
+ * <td valign="top"><code>pool-max</code></td>
+ * <td valign="top">sets the maximum number of Components maintained by the
+ * pool</td>
+ * </tr>
+ * <tr>
+ * <td valign="top"><code>pool-grow</code></td>
+ * <td valign="top">sets the number of Components to grow or
+ * shrink the pool by whenever it becomes necessary to do so</td>
+ * </tr>
+ * </table>
+ * </p><p>
+ * NB: It was a deliberate choice not to extend Component. This will have to
* be reassed once we see it in action.
+ * </p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
* @version CVS $Revision: 1.4 $ $Date: 2001/12/11 09:53:32 $
Index: src/java/org/apache/avalon/excalibur/xml/xpath/XPathProcessor.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/xml/xpath/XPathProcessor.java,v
retrieving revision 1.5
diff -u -r1.5 XPathProcessor.java
--- src/java/org/apache/avalon/excalibur/xml/xpath/XPathProcessor.java 11 Dec 2001
09:53:32 -0000 1.5
+++ src/java/org/apache/avalon/excalibur/xml/xpath/XPathProcessor.java 13 Feb 2002
+09:40:02 -0000
@@ -22,7 +22,7 @@
/**
* The role implemented by an <code>XSLTProcessor</code>.
*/
- String ROLE = "org.apache.avalon.excalibur.xml.xpath.XPathProcessor";
+ String ROLE = XPathProcessor.class.getName();
/**
* Use an XPath string to select a single node. XPath namespace
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
