mpoeschl 02/04/16 01:07:08
Modified: src/java/org/apache/torque/task TorqueDataModelTask.java
TorqueDocumentationTask.java
src/conf build-torque.xml
Removed: src/java/org/apache/torque/task TorqueCreateDatabase.java
TorqueDataDTDTask.java
Log:
extend DataModelTask to add the targetDatabase to the context
remove CreateDatabase and DataDTDTask (DataModelTask is used instead)
Revision Changes Path
1.12 +1 -0
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDataModelTask.java
Index: TorqueDataModelTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDataModelTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TorqueDataModelTask.java 11 Apr 2002 22:02:06 -0000 1.11
+++ TorqueDataModelTask.java 16 Apr 2002 08:07:07 -0000 1.12
@@ -327,6 +327,7 @@
// now.
context.put("dataModels", dataModels);
context.put("databaseNames", databaseNames);
+ context.put("targetDatabase", targetDatabase);
return context;
}
1.3 +2 -33
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDocumentationTask.java
Index: TorqueDocumentationTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDocumentationTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueDocumentationTask.java 11 Apr 2002 22:02:06 -0000 1.2
+++ TorqueDocumentationTask.java 16 Apr 2002 08:07:07 -0000 1.3
@@ -60,43 +60,13 @@
* An ant task for generating output by using Velocity
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TorqueDocumentationTask.java,v 1.2 2002/04/11 22:02:06 mpoeschl
Exp $
+ * @version $Id: TorqueDocumentationTask.java,v 1.3 2002/04/16 08:07:07 mpoeschl
Exp $
*/
public class TorqueDocumentationTask extends TorqueDataModelTask
{
-
- /**
- * The target database(s) we are generating SQL
- * for. Right now we can only deal with a single
- * target, but we will support multiple targets
- * soon.
- */
- private String targetDatabase;
-
+ /** output format for the generated docs */
private String outputFormat;
-
- /**
- * Get the current target package.
- *
- * @return String target database(s)
- */
- public String getTargetDatabase()
- {
- return targetDatabase;
- }
-
- /**
- * Set the current target package. This is where
- * generated java classes will live.
- *
- * @param v target database(s)
- */
- public void setTargetDatabase(String v)
- {
- targetDatabase = v;
- }
-
/**
* Get the current output format.
*
@@ -123,7 +93,6 @@
public Context initControlContext() throws Exception
{
super.initControlContext();
- context.put("targetDatabase", targetDatabase);
context.put("outputFormat", outputFormat);
return context;
}
1.24 +2 -2 jakarta-turbine-torque/src/conf/build-torque.xml
Index: build-torque.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build-torque.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build-torque.xml 11 Apr 2002 17:10:40 -0000 1.23
+++ build-torque.xml 16 Apr 2002 08:07:07 -0000 1.24
@@ -128,7 +128,7 @@
<taskdef
name="torque-create-db"
- classname="org.apache.torque.task.TorqueCreateDatabase">
+ classname="org.apache.torque.task.TorqueDataModelTask">
<classpath refid="torque-classpath"/>
</taskdef>
@@ -346,7 +346,7 @@
<taskdef
name="torque-datadtd"
- classname="org.apache.torque.task.TorqueDataDTDTask">
+ classname="org.apache.torque.task.TorqueDataModelTask">
<classpath refid="torque-classpath"/>
</taskdef>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
