kschrader 2002/07/26 07:48:23
Modified: . default.properties maven.xml
src/java/org/apache/torque Torque.java
src/templates/om BaseManager.vm
Log:
1. Fixed the maven-b5 build to cope over the default.properties file
correctly.
2. Changed the managers so that the syntax to specify an alternate manager
for a class uses the fully qualified classname.
Old: torque.managers.FooManager.classname = org.company.FooManager
New: torque.managed_class.org.company.Foo.manager = org.company.FooManager
This change allows multiple OM classes with the same name (from
several different legacy databases, for example) to use the managers
without conflicting with one another.
Revision Changes Path
1.36 +1 -1 jakarta-turbine-torque/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/default.properties,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- default.properties 25 Jul 2002 03:51:49 -0000 1.35
+++ default.properties 26 Jul 2002 14:48:23 -0000 1.36
@@ -50,7 +50,7 @@
xerces.jar = ${lib.repo}/xercesImpl-2.0.2.jar
xmlParserAPIs.jar = ${lib.repo}/xmlParserAPIs-2.0.2.jar
village.jar = ${lib.repo}/village-1.5.3.jar
-log4j.jar = ${lib.repo}/log4j-1.1.3.jar
+log4j.jar = ${lib.repo}/log4j-1.2.4.jar
commons-beanutils.jar = ${lib.repo}/commons-beanutils-1.4-dev-20020724.jar
commons-collections.jar = ${lib.repo}/commons-collections-2.0.jar
commons-configuration.jar = ${lib.repo}/commons-configuration-1.0-dev.jar
1.3 +7 -0 jakarta-turbine-torque/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 24 Jul 2002 15:36:30 -0000 1.2
+++ maven.xml 26 Jul 2002 14:48:23 -0000 1.3
@@ -9,6 +9,13 @@
todir="${maven.build.dest}/org/apache/torque/engine/database/transform"
/>
+ <!-- copy default.properties to the right place -->
+
+ <copy
+ file="${maven.src.dir}/conf/default.properties"
+ todir="${maven.build.dest}/org/apache/torque"
+ />
+
<!-- copy templates to the right place -->
<copy todir="${maven.build.dest}">
1.68 +17 -14 jakarta-turbine-torque/src/java/org/apache/torque/Torque.java
Index: Torque.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/Torque.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Torque.java 24 Jul 2002 11:49:09 -0000 1.67
+++ Torque.java 26 Jul 2002 14:48:23 -0000 1.68
@@ -92,6 +92,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Kurt Schrader</a>
* @version $Id$
*/
public class Torque
@@ -114,13 +115,13 @@
* A prefix for <code>Manager</code> properties in
* TurbineResource.properties.
*/
- public static final String MANAGER_PREFIX = "managers.";
+ public static final String MANAGER_PREFIX = "managed_class.";
/**
* A <code>Service</code> property determining its implementing
* class name .
*/
- public static final String CLASSNAME_SUFFIX = ".classname";
+ public static final String MANAGER_SUFFIX = ".manager";
/**
@@ -395,15 +396,17 @@
/**
- * Creates a mapping between Manager names and class names.
+ * Creates a mapping between classes and their manager classes.
*
* The mapping is built according to settings present in
* TurbineResources.properties. The entries should have the
* following form:
*
* <pre>
- * torque.manager.MyManager.classname=com.mycompany.MyManagerImpl
- * services.manager.MyOtherManager.classname=com.mycompany.MyOtherManagerImpl
+ * torque.managed_class.com.mycompany.Myclass.manager= \
+ * com.mycompany.MyManagerImpl
+ * services.managed_class.com.mycompany.Myotherclass.manager= \
+ * com.mycompany.MyOtherManagerImpl
* </pre>
*
* <br>
@@ -418,7 +421,7 @@
throws TorqueException
{
int pref = MANAGER_PREFIX.length();
- int suff = CLASSNAME_SUFFIX.length();
+ int suff = MANAGER_SUFFIX.length();
Iterator keys = configuration.getKeys();
@@ -427,17 +430,17 @@
String key = (String) keys.next();
if (key.startsWith(MANAGER_PREFIX)
- && key.endsWith(CLASSNAME_SUFFIX))
+ && key.endsWith(MANAGER_SUFFIX))
{
- String managerKey = key.substring(pref, key.length() - suff);
- if (!managers.containsKey(managerKey))
+ String managedClassKey = key.substring(pref, key.length() - suff);
+ if (!managers.containsKey(managedClassKey))
{
String managerClass = configuration.getString(key);
- category.info("Added Mapping for Manager: " + managerKey
+ category.info("Added Manager for Class: " + managedClassKey
+ " -> " + managerClass);
try
{
- initManager(managerKey, managerClass);
+ initManager(managedClassKey, managerClass);
}
catch (TorqueException e)
{
@@ -478,7 +481,7 @@
catch (Exception e)
{
throw new TorqueException(
- "Could not instantiate manager associated with key: "
+ "Could not instantiate manager associated with class: "
+ name, e);
}
}
@@ -648,7 +651,7 @@
AbstractBaseManager m = (AbstractBaseManager) managers.get(name);
if (m == null)
{
- category.debug("Added late Mapping for Manager: "
+ category.debug("Added late Manager mapping for Class: "
+ name + " -> " + defaultClassName);
try
1.11 +3 -3 jakarta-turbine-torque/src/templates/om/BaseManager.vm
Index: BaseManager.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/BaseManager.vm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BaseManager.vm 22 Jun 2002 21:34:39 -0000 1.10
+++ BaseManager.vm 26 Jul 2002 14:48:23 -0000 1.11
@@ -41,7 +41,7 @@
extends AbstractBaseManager
{
/** The name of the manager */
- protected static String MANAGER_NAME = "${interfaceName}Manager";
+ protected static String MANAGED_CLASS = "${package}.${interfaceName}";
/** The name of our class to pass to Torque as the default manager. */
protected static String DEFAULT_MANAGER_CLASS
@@ -56,7 +56,7 @@
public static ${interfaceName}Manager getManager()
{
return (${interfaceName}Manager)
- Torque.getManager(${interfaceName}Manager.MANAGER_NAME,
+ Torque.getManager(${interfaceName}Manager.MANAGED_CLASS,
${interfaceName}Manager.DEFAULT_MANAGER_CLASS);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
