You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by mp...@apache.org on 2004/01/17 03:39:34 UTC

cvs commit: db-torque/src/generator/src/java/org/apache/torque/task TorqueDataModelTask.java

mpoeschl    2004/01/16 18:39:34

  Modified:    src/generator/src/conf build-torque.xml
               src/maven-plugin plugin.jelly
               src/generator/src/java/org/apache/torque/task
                        TorqueDataModelTask.java
  Log:
  TorqueDataModelTask:
  remove basePathToDbProps
  
  build-torque.xml, plugin.jelly:
  remove basePathToDbProps attribute in sql task definitions
  
  Revision  Changes    Path
  1.10      +0 -2      db-torque/src/generator/src/conf/build-torque.xml
  
  Index: build-torque.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/conf/build-torque.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build-torque.xml	3 Sep 2003 18:05:44 -0000	1.9
  +++ build-torque.xml	17 Jan 2004 02:39:34 -0000	1.10
  @@ -177,7 +177,6 @@
     <target name="sql-classpath" if="torque.internal.useClasspath">
       <echo message="loading templates from classpath"/>
       <torque-sql
  -      basePathToDbProps="sql/base/"
         contextProperties="${torque.contextProperties}"
         controlTemplate="${torque.template.sql}"
         idTableXMLFile="${torque.idTableXMLFile}"
  @@ -196,7 +195,6 @@
     <target name="sql-template" unless="torque.internal.useClasspath">
       <echo message="loading templates from ${torque.templatePath}"/>
       <torque-sql
  -      basePathToDbProps="sql/base/"
         contextProperties="${torque.contextProperties}"
         controlTemplate="${torque.template.sql}"
         idTableXMLFile="${torque.idTableXMLFile}"
  
  
  
  1.10      +0 -2      db-torque/src/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.jelly,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- plugin.jelly	23 Oct 2003 10:19:48 -0000	1.9
  +++ plugin.jelly	17 Jan 2004 02:39:34 -0000	1.10
  @@ -134,7 +134,6 @@
       <j:choose>
         <j:when test="${torque.useClasspath}">
           <torque-sql
  -          basePathToDbProps="sql/base/"
             contextProperties="${torque.contextProperties}"
             controlTemplate="${torque.template.sql}"
             idTableXMLFile="${torque.idTableXMLFile}"
  @@ -151,7 +150,6 @@
         </j:when>
         <j:otherwise>
           <torque-sql
  -          basePathToDbProps="sql/base/"
             contextProperties="${torque.contextProperties}"
             controlTemplate="${torque.template.sql}"
             idTableXMLFile="${torque.idTableXMLFile}"
  
  
  
  1.8       +1 -33     db-torque/src/generator/src/java/org/apache/torque/task/TorqueDataModelTask.java
  
  Index: TorqueDataModelTask.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/java/org/apache/torque/task/TorqueDataModelTask.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TorqueDataModelTask.java	31 Oct 2003 18:37:40 -0000	1.7
  +++ TorqueDataModelTask.java	17 Jan 2004 02:39:34 -0000	1.8
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -126,13 +126,6 @@
        */
       protected String sqldbmap;
   
  -    /**
  -     * The path to properties file containing db idiosyncrasies is
  -     * constructed by appending the "getTargetDatabase()/db.props to this path.
  -     * @deprecated replaced by the platform package
  -     */
  -    private String basePathToDbProps;
  -
       /** The target database(s) we are generating SQL for. */
       private String targetDatabase;
   
  @@ -250,31 +243,6 @@
       public void setTargetPackage(String v)
       {
           targetPackage = v;
  -    }
  -
  -    /**
  -     * The path to properties file containing db idiosyncrasies is
  -     * constructed by appending the "getTargetDatabase()/db.props to this path.
  -     *
  -     * @return basepath to db.props
  -     * @deprecated replaced by the platform package
  -     */
  -    public String getBasePathToDbProps()
  -    {
  -        return basePathToDbProps;
  -    }
  -
  -    /**
  -     * The path to properties file containing db idiosyncrasies is
  -     * constructed by appending the "getTargetDatabase()/db.props
  -     * to this path.
  -     *
  -     * @param v basepath to db.props
  -     * @deprecated replaced by the platform package
  -     */
  -    public void setBasePathToDbProps(String  v)
  -    {
  -        this.basePathToDbProps = v;
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org