henning 2004/11/01 07:12:42
Modified: . Tag: TORQUE_3_1_BRANCH project.xml
src/java/org/apache/torque Tag: TORQUE_3_1_BRANCH
Torque.java
src/java/org/apache/torque/adapter Tag: TORQUE_3_1_BRANCH
DBNone.java
src/java/org/apache/torque/om Tag: TORQUE_3_1_BRANCH
BaseObject.java
src/java/org/apache/torque/util Tag: TORQUE_3_1_BRANCH
BasePeer.java Criteria.java
Log:
Remove some deprecated methods and the Stratum dependency.
Revision Changes Path
No revision
No revision
1.103.2.21 +0 -7 db-torque/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/db-torque/project.xml,v
retrieving revision 1.103.2.20
retrieving revision 1.103.2.21
diff -u -r1.103.2.20 -r1.103.2.21
--- project.xml 29 Oct 2004 11:52:51 -0000 1.103.2.20
+++ project.xml 1 Nov 2004 15:12:39 -0000 1.103.2.21
@@ -127,13 +127,6 @@
</dependency>
<dependency>
- <artifactId>stratum</artifactId>
- <groupId>stratum</groupId>
- <version>1.0-b5</version>
- <url>http://jakarta.apache.org/turbine/stratum/</url>
- </dependency>
-
- <dependency>
<artifactId>village</artifactId>
<groupId>village</groupId>
<version>2.0-dev-20030825</version>
No revision
No revision
1.91.2.3 +2 -63 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.2.2
retrieving revision 1.91.2.3
diff -u -r1.91.2.2 -r1.91.2.3
--- Torque.java 20 May 2004 04:35:16 -0000 1.91.2.2
+++ Torque.java 1 Nov 2004 15:12:39 -0000 1.91.2.3
@@ -20,10 +20,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;
@@ -32,12 +28,6 @@
* A static facade wrapper around the Torque implementation (which is in
* [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.
- *
- * @todo This class will be made abstract once Stratum is removed.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Magn�s ��r Torfason</a>
@@ -48,10 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Kurt Schrader</a>
* @version $Id$
*/
-public class Torque
- implements Initializable,
- Configurable,
- Disposable
+public abstract class Torque
{
/**
* Name of property that specifies the default map builder and map.
@@ -80,12 +67,6 @@
*/
private static TorqueInstance torqueSingleton = null;
- /**
- * This is a member variable of Torque objects created by the Stratum
- * lifecycle
- */
- private Configuration memberConfig = null;
-
/**
* C'tor for usage with the Stratum Lifecycle.
*
@@ -317,47 +298,5 @@
public static void closeConnection(Connection con)
{
getInstance().closeConnection(con);
- }
-
- /*
- * ========================================================================
- *
- * Stratum Lifecycle Interface (deprecated)
- *
- * ========================================================================
- */
-
- /**
- * 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.
- */
- public void configure(Configuration conf) throws TorqueException
- {
- this.memberConfig = conf;
- }
-
- /**
- * initialize Torque
- *
- * @see org.apache.stratum.lifecycle.Initializable
- * @throws TorqueException Any exceptions caught during processing will be
- * rethrown wrapped into a TorqueException.
- */
- public void initialize() throws TorqueException
- {
- getInstance().init(memberConfig);
- }
-
- /**
- * Shuts down the service, Lifecycle style
- * @see org.apache.stratum.lifecycle.Disposable
- */
- public void dispose()
- {
- getInstance().shutdown();
}
}
No revision
No revision
1.7.2.3 +1 -9 db-torque/src/java/org/apache/torque/adapter/DBNone.java
Index: DBNone.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/adapter/DBNone.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- DBNone.java 20 May 2004 04:35:15 -0000 1.7.2.2
+++ DBNone.java 1 Nov 2004 15:12:40 -0000 1.7.2.3
@@ -46,14 +46,6 @@
}
/**
- * does nothing.
- * @deprecated simply remove the call from your code
- */
- public void init(String url, String username, String password)
- {
- }
-
- /**
* This method is used to ignore case.
*
* @param in The string to transform to upper case.
No revision
No revision
1.18.2.3 +1 -12 db-torque/src/java/org/apache/torque/om/BaseObject.java
Index: BaseObject.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/om/BaseObject.java,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- BaseObject.java 20 May 2004 04:36:05 -0000 1.18.2.2
+++ BaseObject.java 1 Nov 2004 15:12:40 -0000 1.18.2.3
@@ -265,17 +265,6 @@
* gets a commons-logging Log based on class name.
*
* @return a <code>Log</code> to write log to.
- * @deprecated Use getLog()
- */
- protected Log log()
- {
- return getLog();
- }
-
- /**
- * gets a commons-logging Log based on class name.
- *
- * @return a <code>Log</code> to write log to.
*/
protected Log getLog()
{
No revision
No revision
1.76.2.6 +1 -26 db-torque/src/java/org/apache/torque/util/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/BasePeer.java,v
retrieving revision 1.76.2.5
retrieving revision 1.76.2.6
diff -u -r1.76.2.5 -r1.76.2.6
--- BasePeer.java 11 Sep 2004 14:28:59 -0000 1.76.2.5
+++ BasePeer.java 1 Nov 2004 15:12:40 -0000 1.76.2.6
@@ -90,14 +90,6 @@
/** Classes that implement this class should override this value. */
public static final String TABLE_NAME = "TABLE_NAME";
- /**
- * The Torque default MapBuilder.
- *
- * @deprecated there is no default map builder!
- */
- public static final String DEFAULT_MAP_BUILDER =
- "org.apache.torque.util.db.map.TurbineMapBuilder";
-
/** Hashtable that contains the cached mapBuilders. */
private static Hashtable mapBuilders = new Hashtable(5);
@@ -1906,23 +1898,6 @@
{
throw new TorqueException("Criteria expected single Record and "
+ "Multiple Records were selected");
- }
-
- /**
- * This method returns the MapBuilder specified in the
- * configuration file. By default, this is
- * org.apache.torque.util.db.map.TurbineMapBuilder.
- * FIXME! With the decoupled Torque there seem to be no
- * default map builder anymore.
- *
- * @return A MapBuilder.
- * @throws TorqueException Any exceptions caught during processing will be
- * rethrown wrapped into a TorqueException.
- * @deprecated you have to specify the name of the map builder!
- */
- public static MapBuilder getMapBuilder() throws TorqueException
- {
- return getMapBuilder(DEFAULT_MAP_BUILDER.trim());
}
/**
1.42.2.4 +1 -14 db-torque/src/java/org/apache/torque/util/Criteria.java
Index: Criteria.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/Criteria.java,v
retrieving revision 1.42.2.3
retrieving revision 1.42.2.4
diff -u -r1.42.2.3 -r1.42.2.4
--- Criteria.java 20 May 2004 04:36:06 -0000 1.42.2.3
+++ Criteria.java 1 Nov 2004 15:12:42 -0000 1.42.2.4
@@ -2957,19 +2957,6 @@
}
/**
- * Peers can set this flag to notify BasePeer that the table(s) involved
- * in the Criteria contain Blobs, so that the operation can be placed
- * in a transaction if the db requires it.
- * This is primarily to support Postgresql.
- *
- * @deprecated this flag is not used any longer
- */
- public void setBlobFlag(boolean b)
- {
- // do nothing as we don't use the flag any longer
- }
-
- /**
* This is an inner class that describes an object in the
* criteria.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
