mpoeschl 2003/10/31 10:31:38
Modified: . project.xml
xdocs changes.xml
src/java/org/apache/torque Torque.java
Log:
Remove support for stratum lifecycle interfaces.
Revision Changes Path
1.110 +0 -5 db-torque/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/db-torque/project.xml,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- project.xml 28 Oct 2003 19:04:10 -0000 1.109
+++ project.xml 31 Oct 2003 18:31:37 -0000 1.110
@@ -84,11 +84,6 @@
<url>http://jakarta.apache.org/avalon/logkit/</url>
</dependency>
<dependency>
- <id>stratum</id>
- <version>1.0-b3</version>
- <url>http://jakarta.apache.org/turbine/stratum/</url>
- </dependency>
- <dependency>
<id>village</id>
<version>2.0-dev-20030825</version>
<url>http://share.whichever.com/index.php?SCREEN=village</url>
1.116 +3 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- changes.xml 30 Oct 2003 17:47:21 -0000 1.115
+++ changes.xml 31 Oct 2003 18:31:38 -0000 1.116
@@ -9,6 +9,9 @@
<release version="3.2-alpha" date="in CVS">
+ <action dev='mpoeschl' type='remove'>
+ Remove support for stratum lifecycle interfaces.
+ </action>
<action dev='mpoeschl' type='add'>
TRQS163: Add domain element to schema.xml. Domains are used to define
attributes for columns.
1.92 +6 -14 db-torque/src/java/org/apache/torque/Torque.java
Index: Torque.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/Torque.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Torque.java 5 Aug 2003 18:09:35 -0000 1.91
+++ Torque.java 31 Oct 2003 18:31:38 -0000 1.92
@@ -58,10 +58,6 @@
import org.apache.commons.configuration.Configuration;
-import org.apache.stratum.lifecycle.Configurable;
-import org.apache.stratum.lifecycle.Disposable;
-import org.apache.stratum.lifecycle.Initializable;
-
import org.apache.torque.adapter.DB;
import org.apache.torque.manager.AbstractBaseManager;
import org.apache.torque.map.DatabaseMap;
@@ -71,9 +67,8 @@
* [EMAIL PROTECTED] org.apache.torque.TorqueInstance}).
* <br/>
* For historical reasons this class also contains a thin object which can
- * be used to configure Torque with the Stratum Lifecycle. This is deprecated
- * and will be removed in the future in favour of using Torque as an Avalon
- * Component.
+ * be used to configure Torque. This is deprecated and will be removed in the
+ * future in favour of using Torque as an Avalon Component.
*
* @todo This class will be made abstract once Stratum is removed.
*
@@ -87,9 +82,6 @@
* @version $Id$
*/
public class Torque
- implements Initializable,
- Configurable,
- Disposable
{
/**
* Name of property that specifies the default map builder and map.
@@ -369,9 +361,9 @@
* configure torque
*
* @param conf Configuration
- * @see org.apache.stratum.lifecycle.Configurable
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
+ * @deprecated
*/
public void configure(Configuration conf) throws TorqueException
{
@@ -381,9 +373,9 @@
/**
* initialize Torque
*
- * @see org.apache.stratum.lifecycle.Initializable
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
+ * @deprecated
*/
public void initialize() throws TorqueException
{
@@ -392,7 +384,7 @@
/**
* Shuts down the service, Lifecycle style
- * @see org.apache.stratum.lifecycle.Disposable
+ * @deprecated
*/
public void dispose()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
