You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/05/20 22:44:44 UTC
cvs commit: avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ids IdGenerator.java SequenceIdGenerator.java TableIdGenerator.java
bloritsch 2003/05/20 13:44:44
Modified: datasource build.xml default.properties
datasource/examples/conf components.xml
datasource/src/java/org/apache/avalon/excalibur/datasource
InformixDataSource.java J2eeDataSource.java
JdbcDataSource.java
ResourceLimitingJdbcDataSource.java
datasource/src/java/org/apache/avalon/excalibur/datasource/cluster
DefaultHashedDataSourceCluster.java
DefaultIndexedDataSourceCluster.java
DefaultRoundRobinDataSourceCluster.java
HashedDataSourceCluster.java
IndexedDataSourceCluster.java
RoundRobinDataSourceCluster.java
datasource/src/java/org/apache/avalon/excalibur/datasource/ids
IdGenerator.java SequenceIdGenerator.java
TableIdGenerator.java
Log:
add metadata attributes
Revision Changes Path
1.49 +14 -3 avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/build.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build.xml 8 May 2003 17:30:30 -0000 1.48
+++ build.xml 20 May 2003 20:44:43 -0000 1.49
@@ -392,9 +392,9 @@
<copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
- <copy todir="${dist.dir}/docs">
- <fileset dir="${docs.dir}"/>
- </copy>
+ <copy todir="${dist.dir}/docs">
+ <fileset dir="${docs.dir}"/>
+ </copy>
<zip zipfile="${dist.dir}/src.zip" compress="false">
<zipfileset dir="src/java"/>
@@ -503,4 +503,15 @@
<delete dir="${dist.base}" />
</target>
+ <!-- ===================================================================== -->
+ <!-- Fix Whitespace problems in source code -->
+ <!-- ===================================================================== -->
+ <target name="fixCRLF">
+ <fixcrlf srcdir="."
+ includes="**/*.java,**/*.xml,*.xml,*.properties,**/*.properties"
+ eol="lf"
+ tab="remove"
+ tablength="4"
+ eof="remove"/>
+ </target>
</project>
1.29 +129 -129 avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- default.properties 18 Apr 2003 13:04:49 -0000 1.28
+++ default.properties 20 May 2003 20:44:43 -0000 1.29
@@ -1,129 +1,129 @@
-# -------------------------------------------------------------------
-# B U I L D P R O P E R T I E S
-# -------------------------------------------------------------------
-# Specifies default property values
-# Overridden by ../default.properties and all ant.properties
-# Not user-editable; use ant.properties files instead
-
-name=excalibur-datasource
-Name=Excalibur Datasource
-dir-name=datasource
-version=1.1.1
-package-version=1.0
-year=2000-2003
-
-# --------------------------------------------------
-# REQUIRED LIBRARIES
-# --------------------------------------------------
-
-# ----- Avalon Framework -----
-avalon-framework.home=${basedir}/../../avalon
-avalon-framework.lib=${avalon-framework.home}/target/lib
-avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
-
-# ----- Logkit -----
-logkit.home=${basedir}/../../avalon-logkit
-logkit.lib=${logkit.home}/build/lib
-logkit.jar=${logkit.lib}/logkit.jar
-
-# ----- Excalibur pool, version 1.1 or later -----
-excalibur-pool.home=${basedir}/../pool/dist
-excalibur-pool.lib=${excalibur-pool.home}
-excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
-
-# ----- Excalibur instrument, version 1.0 or later -----
-excalibur-instrument.home=${basedir}/../instrument/dist
-excalibur-instrument.lib=${excalibur-instrument.home}
-excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-1.0.jar
-
-# ----- Excalibur i18n, version 1.0 or later -----
-excalibur-i18n.home=${basedir}/../i18n/dist
-excalibur-i18n.lib=${excalibur-i18n.home}
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
-
-
-# ----- Commons Collections, version 2.1 or later -----
-comons-collections.jar=../lib/commons-collections-2.1.jar
-
-# ----- Doug Lea's Concurrent Utils, version 1.3 or later -----
-util.concurrent.jar=../lib/util.concurrent-1.3.1.jar
-
-# --------------------------------------------------
-# OPTIONAL LIBRARIES
-# --------------------------------------------------
-
-# For unit testing
-
-# ----- Excalibur component, version 1.0 or later -----
-excalibur-component.home=${basedir}/../component/dist
-excalibur-component.lib=${excalibur-component.home}
-excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.1.jar
-excalibur-testcase.jar=${excalibur-component.lib}/excalibur-testcase-1.1.jar
-
-# ----- Excalibur logger, version 1.0 or later -----
-excalibur-logger.home=${basedir}/../logger/dist
-excalibur-logger.lib=${excalibur-logger.home}
-excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.1.jar
-
-test.jdbc.driver.jar=lib/hsqldb-1.7.1.jar
-test.jdbc.driver=org.hsqldb.jdbcDriver
-test.jdbc.url=jdbc:hsqldb:test
-test.jdbc.user=sa
-test.jdbc.password=
-#skip.tests=true
-
-# --------------------------------------------------
-
-# Settings used to configure compile environment
-build.debug = on
-build.optimize = off
-build.deprecation = off
-build.compress = false
-junit.failonerror = false
-
-# location of intermediate products
-build.dir = build
-build.testsrc = ${build.dir}/testsrc
-build.testclasses = ${build.dir}/testclasses
-build.src = ${build.dir}/src
-build.testsrc = ${build.dir}/testsrc
-build.testclasses = ${build.dir}/testclasses
-build.lib = ${build.dir}/lib
-build.conf = ${build.dir}/conf
-build.classes = ${build.dir}/classes
-build.tests = ${build.dir}/tests
-build.reports = ${build.dir}/reports
-
-# Set the properties for source directories
-src.dir = src
-java.dir = ${src.dir}/java
-conf.dir = ${src.dir}/conf
-test.dir = ${src.dir}/test
-
-# needed by Cocoon
-build.context = ${build.dir}/documentation
-build.docs = ${build.dir}/docs
-build.xdocs = ${build.dir}/xdocs
-context.dir = ../../avalon/src/documentation
-tools.dir = ../../avalon/tools
-tools.jar = ${java.home}/../lib/tools.jar
-docs.dir = docs
-xdocs.dir = ${src.dir}/xdocs
-
-# Set the properties for distribution directories
-dist.dir = dist
-dist.javadocs = ${docs.dir}/api
-
-# name of .zip/.tar.gz/.bz2 files and their top-level directory
-dist.name = ${name}-${version}
-
-# name of jar file
-jar.name = ${name}-${version}.jar
-jar.cluster.name = ${name}-cluster-${version}a.jar
-jar.ids.name = ${name}-ids-${version}a.jar
-
-# property indicating directory where all distribution archives are placed
-dist.base = distributions
-
-depchecker.prefix=.
-
+# -------------------------------------------------------------------
+# B U I L D P R O P E R T I E S
+# -------------------------------------------------------------------
+# Specifies default property values
+# Overridden by ../default.properties and all ant.properties
+# Not user-editable; use ant.properties files instead
+
+name=excalibur-datasource
+Name=Excalibur Datasource
+dir-name=datasource
+version=1.1.1
+package-version=1.0
+year=2000-2003
+
+# --------------------------------------------------
+# REQUIRED LIBRARIES
+# --------------------------------------------------
+
+# ----- Avalon Framework -----
+avalon-framework.home=${basedir}/../../avalon
+avalon-framework.lib=${avalon-framework.home}/target/lib
+avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
+
+# ----- Logkit -----
+logkit.home=${basedir}/../../avalon-logkit
+logkit.lib=${logkit.home}/build/lib
+logkit.jar=${logkit.lib}/logkit.jar
+
+# ----- Excalibur pool, version 1.1 or later -----
+excalibur-pool.home=${basedir}/../pool/dist
+excalibur-pool.lib=${excalibur-pool.home}
+excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
+
+# ----- Excalibur instrument, version 1.0 or later -----
+excalibur-instrument.home=${basedir}/../instrument/dist
+excalibur-instrument.lib=${excalibur-instrument.home}
+excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-1.0.jar
+
+# ----- Excalibur i18n, version 1.0 or later -----
+excalibur-i18n.home=${basedir}/../i18n/dist
+excalibur-i18n.lib=${excalibur-i18n.home}
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+
+
+# ----- Commons Collections, version 2.1 or later -----
+comons-collections.jar=../lib/commons-collections-2.1.jar
+
+# ----- Doug Lea's Concurrent Utils, version 1.3 or later -----
+util.concurrent.jar=../lib/util.concurrent-1.3.1.jar
+
+# --------------------------------------------------
+# OPTIONAL LIBRARIES
+# --------------------------------------------------
+
+# For unit testing
+
+# ----- Excalibur component, version 1.0 or later -----
+excalibur-component.home=${basedir}/../component/dist
+excalibur-component.lib=${excalibur-component.home}
+excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.1.jar
+excalibur-testcase.jar=${excalibur-component.lib}/excalibur-testcase-1.1.jar
+
+# ----- Excalibur logger, version 1.0 or later -----
+excalibur-logger.home=${basedir}/../logger/dist
+excalibur-logger.lib=${excalibur-logger.home}
+excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.1.jar
+
+test.jdbc.driver.jar=lib/hsqldb-1.7.1.jar
+test.jdbc.driver=org.hsqldb.jdbcDriver
+test.jdbc.url=jdbc:hsqldb:test
+test.jdbc.user=sa
+test.jdbc.password=
+#skip.tests=true
+
+# --------------------------------------------------
+
+# Settings used to configure compile environment
+build.debug = on
+build.optimize = off
+build.deprecation = off
+build.compress = false
+junit.failonerror = false
+
+# location of intermediate products
+build.dir = build
+build.testsrc = ${build.dir}/testsrc
+build.testclasses = ${build.dir}/testclasses
+build.src = ${build.dir}/src
+build.testsrc = ${build.dir}/testsrc
+build.testclasses = ${build.dir}/testclasses
+build.lib = ${build.dir}/lib
+build.conf = ${build.dir}/conf
+build.classes = ${build.dir}/classes
+build.tests = ${build.dir}/tests
+build.reports = ${build.dir}/reports
+
+# Set the properties for source directories
+src.dir = src
+java.dir = ${src.dir}/java
+conf.dir = ${src.dir}/conf
+test.dir = ${src.dir}/test
+
+# needed by Cocoon
+build.context = ${build.dir}/documentation
+build.docs = ${build.dir}/docs
+build.xdocs = ${build.dir}/xdocs
+context.dir = ../../avalon/src/documentation
+tools.dir = ../../avalon/tools
+tools.jar = ${java.home}/../lib/tools.jar
+docs.dir = docs
+xdocs.dir = ${src.dir}/xdocs
+
+# Set the properties for distribution directories
+dist.dir = dist
+dist.javadocs = ${docs.dir}/api
+
+# name of .zip/.tar.gz/.bz2 files and their top-level directory
+dist.name = ${name}-${version}
+
+# name of jar file
+jar.name = ${name}-${version}.jar
+jar.cluster.name = ${name}-cluster-${version}a.jar
+jar.ids.name = ${name}-ids-${version}a.jar
+
+# property indicating directory where all distribution archives are placed
+dist.base = distributions
+
+depchecker.prefix=.
+
1.2 +1 -1 avalon-excalibur/datasource/examples/conf/components.xml
Index: components.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/examples/conf/components.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- components.xml 29 May 2002 13:20:32 -0000 1.1
+++ components.xml 20 May 2003 20:44:43 -0000 1.2
@@ -21,4 +21,4 @@
<hello-db logger="app">
<dbpool>test-db</dbpool>
</hello-db>
-</components>
\ No newline at end of file
+</components>
1.16 +6 -1 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/InformixDataSource.java
Index: InformixDataSource.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/InformixDataSource.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- InformixDataSource.java 29 Apr 2003 03:04:05 -0000 1.15
+++ InformixDataSource.java 20 May 2003 20:44:43 -0000 1.16
@@ -113,6 +113,11 @@
* to, and <code>level</code> specifies the tracing level to be used, as
* documented in the Informix JDBC programmers guide.
* </p>
+ *
+ * @avalon.component
+ * @avalon.service type=DataSourceComponent
+ * @x-avalon.info name=informix
+ * @x-avalon.lifestyle type=singleton
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
1.13 +6 -1 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/J2eeDataSource.java
Index: J2eeDataSource.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/J2eeDataSource.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- J2eeDataSource.java 29 Apr 2003 03:04:05 -0000 1.12
+++ J2eeDataSource.java 20 May 2003 20:44:43 -0000 1.13
@@ -67,6 +67,11 @@
* <code>javax.sql.DataSource</code> object and assumes that the
* J2EE container pools the datasources properly.
*
+ * @avalon.component
+ * @avalon.service type=DataSourceComponent
+ * @x-avalon.info name=j2ee-datasource
+ * @x-avalon.lifestyle type=singleton
+ *
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @version CVS $Revision$ $Date$
* @since 4.0
1.24 +6 -1 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/JdbcDataSource.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JdbcDataSource.java 29 Apr 2003 03:04:05 -0000 1.23
+++ JdbcDataSource.java 20 May 2003 20:44:43 -0000 1.24
@@ -113,6 +113,11 @@
* <li>The <code>user</code> and <code>password</code> attributes are used to specify the user and
* password for connections to the database. (Required)</li>
* </ul>
+ *
+ * @avalon.component
+ * @avalon.service type=DataSourceComponent
+ * @x-avalon.info name=jdbc
+ * @x-avalon.lifestyle type=singleton
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @version CVS $Revision$ $Date$
1.8 +9 -4 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ResourceLimitingJdbcDataSource.java
Index: ResourceLimitingJdbcDataSource.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ResourceLimitingJdbcDataSource.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResourceLimitingJdbcDataSource.java 9 Apr 2003 02:26:35 -0000 1.7
+++ ResourceLimitingJdbcDataSource.java 20 May 2003 20:44:43 -0000 1.8
@@ -79,7 +79,7 @@
* <p>
* Configuration Example:
* <pre>
- * <jdbc>
+ * <rl-jdbc>
* <pool-controller max="<i>10</i>" maxStrict="<i>true</i>"
* blocking="<i>true</i>" timeout="<i>-1</i>"
* trim-interval="<i>60000</i>" auto-commit="true"
@@ -90,7 +90,7 @@
* <dburl><i>jdbc:driver://host/mydb</i></dburl>
* <user><i>username</i></user>
* <password><i>password</i></password>
- * </jdbc>
+ * </rl-jdbc>
* </pre>
* <p>
* Roles Example:
@@ -98,7 +98,7 @@
* <role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
* shorthand="datasources"
* default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
- * <hint shorthand="jdbc"
+ * <hint shorthand="rl-jdbc"
* class="org.apache.avalon.excalibur.datasource.ResourceLimitingJdbcDataSource"/>
* </role>
* </pre>
@@ -170,6 +170,11 @@
* used to specify the user and password for connections to the
* database. (Required)</li>
* </ul>
+ *
+ * @avalon.component
+ * @avalon.service type=DataSourceComponent
+ * @x-avalon.info name=rl-jdbc
+ * @x-avalon.lifestyle type=singleton
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
* @version CVS $Revision$ $Date$
1.6 +7 -1 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/DefaultHashedDataSourceCluster.java
Index: DefaultHashedDataSourceCluster.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/DefaultHashedDataSourceCluster.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultHashedDataSourceCluster.java 29 Apr 2003 03:03:29 -0000 1.5
+++ DefaultHashedDataSourceCluster.java 20 May 2003 20:44:43 -0000 1.6
@@ -143,6 +143,12 @@
* connection = m_dataSource.getConnection();
* }
* </pre>
+ *
+ * @avalon.component
+ * @avalon.service type=org.apache.avalon.excalibur.datasource.DataSourceComponent
+ * @avalon.service type=HashedDataSourceCluster
+ * @x-avalon.info name=hash-db-cluster
+ * @x-avalon.lifestyle type=singleton
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
* @version CVS $Revision$ $Date$
1.5 +7 -1 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/DefaultIndexedDataSourceCluster.java
Index: DefaultIndexedDataSourceCluster.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/DefaultIndexedDataSourceCluster.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultIndexedDataSourceCluster.java 29 Apr 2003 03:03:29 -0000 1.4
+++ DefaultIndexedDataSourceCluster.java 20 May 2003 20:44:43 -0000 1.5
@@ -137,6 +137,12 @@
* connection = m_dataSource.getConnection();
* }
* </pre>
+ *
+ * @avalon.component
+ * @avalon.service type=org.apache.avalon.excalibur.datasource.DataSourceComponent
+ * @avalon.service type=IndexedDataSourceCluster
+ * @x-avalon.info name=index-db-cluster
+ * @x-avalon.lifestyle type=singleton
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
* @version CVS $Revision$ $Date$
1.6 +7 -1 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/DefaultRoundRobinDataSourceCluster.java
Index: DefaultRoundRobinDataSourceCluster.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/DefaultRoundRobinDataSourceCluster.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultRoundRobinDataSourceCluster.java 29 Apr 2003 03:03:29 -0000 1.5
+++ DefaultRoundRobinDataSourceCluster.java 20 May 2003 20:44:43 -0000 1.6
@@ -112,6 +112,12 @@
* <hint shorthand="j2ee" class="org.apache.avalon.excalibur.datasource.J2eeDataSource"/>
* </role>
* </pre>
+ *
+ * @avalon.component
+ * @avalon.service type=org.apache.avalon.excalibur.datasource.DataSourceComponent
+ * @avalon.service type=RoundRobinDataSourceCluster
+ * @x-avalon.info name=rrobin-db-cluster
+ * @x-avalon.lifestyle type=singleton
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
* @version CVS $Revision$ $Date$
1.6 +2 -2 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/HashedDataSourceCluster.java
Index: HashedDataSourceCluster.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/HashedDataSourceCluster.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HashedDataSourceCluster.java 29 Apr 2003 03:03:29 -0000 1.5
+++ HashedDataSourceCluster.java 20 May 2003 20:44:43 -0000 1.6
@@ -65,7 +65,7 @@
/**
* The name of the role for convenience
*/
- String ROLE = "org.apache.avalon.excalibur.datasource.cluster.HashedDataSourceCluster";
+ String ROLE = HashedDataSourceCluster.class.getName();
/**
* Returns the number of DataSources in the cluster.
1.6 +2 -2 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/IndexedDataSourceCluster.java
Index: IndexedDataSourceCluster.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/IndexedDataSourceCluster.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IndexedDataSourceCluster.java 29 Apr 2003 03:03:29 -0000 1.5
+++ IndexedDataSourceCluster.java 20 May 2003 20:44:43 -0000 1.6
@@ -65,7 +65,7 @@
/**
* The name of the role for convenience
*/
- String ROLE = "com.silveregg.util.datasource.cluster.IndexedDataSourceCluster";
+ String ROLE = IndexedDataSourceCluster.class.getName();
/**
* Returns the number of DataSources in the cluster.
1.4 +2 -2 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/RoundRobinDataSourceCluster.java
Index: RoundRobinDataSourceCluster.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/cluster/RoundRobinDataSourceCluster.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RoundRobinDataSourceCluster.java 29 Apr 2003 03:03:29 -0000 1.3
+++ RoundRobinDataSourceCluster.java 20 May 2003 20:44:43 -0000 1.4
@@ -62,6 +62,6 @@
/**
* The name of the role for convenience
*/
- String ROLE = "org.apache.avalon.excalibur.datasource.cluster.RoundRobinDataSourceCluster";
+ String ROLE = RoundRobinDataSourceCluster.class.getName();
}
1.5 +3 -2 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ids/IdGenerator.java
Index: IdGenerator.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ids/IdGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IdGenerator.java 29 Apr 2003 03:02:03 -0000 1.4
+++ IdGenerator.java 20 May 2003 20:44:43 -0000 1.5
@@ -54,6 +54,7 @@
import org.apache.avalon.framework.component.Component;
/**
+ *
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
* @version CVS $Revision$ $Date$
* @since 4.1
@@ -64,7 +65,7 @@
/**
* The name of the role for convenience
*/
- String ROLE = "org.apache.avalon.excalibur.datasource.ids.IdGenerator";
+ String ROLE = IdGenerator.class.getName();
/**
* Returns the next Id from the pool.
1.5 +6 -1 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ids/SequenceIdGenerator.java
Index: SequenceIdGenerator.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ids/SequenceIdGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SequenceIdGenerator.java 29 Apr 2003 03:02:03 -0000 1.4
+++ SequenceIdGenerator.java 20 May 2003 20:44:43 -0000 1.5
@@ -98,6 +98,11 @@
*
* Your component obtains a reference to an IdGenerator using the same method as it obtains a
* DataSource, by making use of a ComponentSelector.
+ *
+ * @avalon.component
+ * @avalon.service type=org.apache.avalon.excalibur.datasource.ids.IDGenerator
+ * @x-avalon.info name=id-generator
+ * @x-avalon.lifestyle type=singleton
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
* @version CVS $Revision$ $Date$
1.6 +6 -1 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ids/TableIdGenerator.java
Index: TableIdGenerator.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ids/TableIdGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TableIdGenerator.java 29 Apr 2003 03:02:03 -0000 1.5
+++ TableIdGenerator.java 20 May 2003 20:44:43 -0000 1.6
@@ -108,6 +108,11 @@
* PRIMARY KEY (table_name)
* );
* </pre>
+ *
+ * @avalon.component
+ * @avalon.service type=org.apache.avalon.excalibur.datasource.ids.IDGenerator
+ * @x-avalon.info name=table-id-generator
+ * @x-avalon.lifestyle type=singleton
*
* @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
* @version CVS $Revision$ $Date$
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org